diff --git a/src/input.cpp b/src/input.cpp
index e99c0d60fe..e16e870373 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -2277,7 +2277,6 @@ void InputRedirection::setupInputFilters()
         }
         installInputEventFilter(new DragAndDropInputFilter);
         installInputEventFilter(new LockScreenFilter);
-        installInputEventFilter(new PopupInputFilter);
         m_windowSelector = new WindowSelectorFilter;
         installInputEventFilter(m_windowSelector);
     }
@@ -2292,6 +2291,9 @@ void InputRedirection::setupInputFilters()
     if (hasGlobalShortcutSupport) {
         installInputEventFilter(new GlobalShortcutFilter);
     }
+    if (waylandServer()) {
+        installInputEventFilter(new PopupInputFilter);
+    }
     installInputEventFilter(new DecorationEventFilter);
     installInputEventFilter(new InternalWindowEventFilter);
     if (waylandServer()) {