diff --git a/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml b/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml
index 11ebc68..17c4e92 100644
--- a/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml
+++ b/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml
@@ -142,8 +142,8 @@ Item {
         }
         Connections {
             target: internalLoader.item.handle
-            onYChanged: updateFromHandleTimer.running = true
-            onXChanged: updateFromHandleTimer.running = true
+            onYChanged: updateFromHandleTimer.restart()
+            onXChanged: updateFromHandleTimer.restart()
         }
         RangeModel {
             id: range
@@ -172,7 +172,7 @@ Item {
             }
 
             onValueChanged: {
-                if (flickableItem.moving) {
+                if (flickableItem.moving || !scrollbar.enabled || !scrollbar.interactive) {
                     return
                 }
 
@@ -201,7 +201,7 @@ Item {
             id: updateFromHandleTimer
             interval: 10
             onTriggered: {
-                if(!enabled || !interactive)
+                if(!scrollbar.enabled || !scrollbar.interactive)
                     return;
                 
                 if (internalLoader.isVertical) {
