diff --git a/widgets/DapScrollView.qml b/widgets/DapScrollView.qml
index fd9159a78fbecb1c372a8f86701116f37eb68bd1..5778abdd3bcd54a15343f8d946674ecdede764b2 100644
--- a/widgets/DapScrollView.qml
+++ b/widgets/DapScrollView.qml
@@ -3,7 +3,14 @@ import QtQuick 2.4
 DapScrollViewForm
 {
     property var contentPos: 0.0
-    viewData.onContentYChanged:
+
+    ////@ Connect to new ListView if changed
+    onViewDataChanged: {
+        viewData.contentYChanged.connect(updateY)
+    }
+
+    ////@ Changes position of arrows when scroll
+    function updateY()
     {
         if (viewData.atYBeginning)
         {
@@ -13,7 +20,7 @@ DapScrollViewForm
         {
             scrollButton.state = "goDown"
         }
-        else if (contentPos < viewData.contentItem.y)
+        else if (contentPos > viewData.contentItem.y)
         {
             scrollButton.state = "goUp"
         }
@@ -21,6 +28,7 @@ DapScrollViewForm
         {
             scrollButton.state = "goDown"
         }
+        contentPos = viewData.contentItem.y
     }
 
     onEntered: