diff --git a/containment/package/contents/ui/layouts/EnvironmentActions.qml b/containment/package/contents/ui/layouts/EnvironmentActions.qml
index 39ee61f5e..fb198d8c3 100644
--- a/containment/package/contents/ui/layouts/EnvironmentActions.qml
+++ b/containment/package/contents/ui/layouts/EnvironmentActions.qml
@@ -76,7 +76,7 @@ Loader {
                 return;
             }
 
-            if (mouse.button == Qt.LeftButton && selectedWindowsTracker.lastActiveWindow.canBeDragged()) {
+            if (mouse.button === Qt.LeftButton && selectedWindowsTracker.lastActiveWindow.canBeDragged()) {
                 lastPressX = mouse.x;
                 lastPressY = mouse.y;
                 dragWindowTimer.start();
@@ -89,7 +89,7 @@ Loader {
         }
 
         onPositionChanged: {
-            if (!root.dragActiveWindowEnabled) {
+            if (!root.dragActiveWindowEnabled || mouse.button !== Qt.LeftButton) {
                 return;
             }