diff --git a/autotests/integration/pointer_constraints_test.cpp b/autotests/integration/pointer_constraints_test.cpp
index 8e2e568619..1225b62240 100644
--- a/autotests/integration/pointer_constraints_test.cpp
+++ b/autotests/integration/pointer_constraints_test.cpp
@@ -186,6 +186,27 @@ void TestPointerConstraints::testConfinedPointer()
     QCOMPARE(pointerPositionChangedSpy.count(), 1);
     QCOMPARE(KWin::Cursor::pos(), position);
 
+    // modifier + click should be ignored
+    // first ensure the settings are ok
+    KConfigGroup group = kwinApp()->config()->group("MouseBindings");
+    group.writeEntry("CommandAllKey", QStringLiteral("Alt"));
+    group.writeEntry("CommandAll1", "Move");
+    group.writeEntry("CommandAll2", "Move");
+    group.writeEntry("CommandAll3", "Move");
+    group.sync();
+    workspace()->slotReconfigure();
+    QCOMPARE(options->commandAllModifier(), Qt::AltModifier);
+    QCOMPARE(options->commandAll1(), Options::MouseUnrestrictedMove);
+    QCOMPARE(options->commandAll2(), Options::MouseUnrestrictedMove);
+    QCOMPARE(options->commandAll3(), Options::MouseUnrestrictedMove);
+
+    quint32 timestamp = 1;
+    kwinApp()->platform()->keyboardKeyPressed(KEY_LEFTALT, timestamp++);
+    kwinApp()->platform()->pointerButtonPressed(BTN_LEFT, timestamp++);
+    QVERIFY(!c->isMove());
+    kwinApp()->platform()->pointerButtonReleased(BTN_LEFT, timestamp++);
+    kwinApp()->platform()->keyboardKeyReleased(KEY_LEFTALT, timestamp++);
+
     // deactivate the client, this should unconfine
     workspace()->activateClient(nullptr);
     QVERIFY(unconfinedSpy.wait());
diff --git a/input.cpp b/input.cpp
index f7564d5e93..39d975d6e6 100644
--- a/input.cpp
+++ b/input.cpp
@@ -707,20 +707,22 @@ std::pair<bool, bool> performClientMouseAction(QMouseEvent *event, AbstractClien
     Options::MouseCommand command = Options::MouseNothing;
     bool wasAction = false;
     if (static_cast<MouseEvent*>(event)->modifiersRelevantForGlobalShortcuts() == options->commandAllModifier()) {
-        wasAction = true;
-        switch (event->button()) {
-        case Qt::LeftButton:
-            command = options->commandAll1();
-            break;
-        case Qt::MiddleButton:
-            command = options->commandAll2();
-            break;
-        case Qt::RightButton:
-            command = options->commandAll3();
-            break;
-        default:
-            // nothing
-            break;
+        if (!input()->pointer()->isConstrained()) {
+            wasAction = true;
+            switch (event->button()) {
+            case Qt::LeftButton:
+                command = options->commandAll1();
+                break;
+            case Qt::MiddleButton:
+                command = options->commandAll2();
+                break;
+            case Qt::RightButton:
+                command = options->commandAll3();
+                break;
+            default:
+                // nothing
+                break;
+            }
         }
     } else {
         if (action == MouseAction::ModifierAndWindow) {