diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index a680ff7913..b7857e2b74 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -189,10 +189,15 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge
     }
 #endif
 
-    /* if a floating tool window is active, keep shortcuts on the
-     * parent working */
-    if (active_window != tlw && active_window && active_window->windowType() == Qt::Tool && active_window->parentWidget()) {
-        active_window = active_window->parentWidget()->window();
+    if (active_window && active_window != tlw) {
+        /* if a floating tool window is active, keep shortcuts on the parent working.
+         * and if a popup window is active (f.ex a completer), keep shortcuts on the
+         * focus proxy working */
+        if (active_window->windowType() == Qt::Tool && active_window->parentWidget()) {
+            active_window = active_window->parentWidget()->window();
+        } else if (active_window->windowType() == Qt::Popup && active_window->focusProxy()) {
+            active_window = active_window->focusProxy()->window();
+        }
     }
 
     if (active_window != tlw) {
diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
index b78287f84b..2c9295d995 100644
--- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
@@ -30,6 +30,8 @@
 #include <QtTest/QtTest>
 #include <qapplication.h>
 #include <qtextedit.h>
+#include <qlineedit.h>
+#include <qcompleter.h>
 #include <qpushbutton.h>
 #include <qmainwindow.h>
 #include <qstatusbar.h>
@@ -120,6 +122,7 @@ private slots:
     void unicodeCompare();
     void context();
     void duplicatedShortcutOverride();
+    void shortcutToFocusProxy();
 
 protected:
     static Qt::KeyboardModifiers toButtons( int key );
@@ -1279,5 +1282,28 @@ void tst_QShortcut::testElement()
     }
 }
 
+void tst_QShortcut::shortcutToFocusProxy()
+{
+    QLineEdit le;
+    QCompleter completer;
+    QStringListModel *slm = new QStringListModel(QStringList() << "a0" << "a1" << "a2", &completer);
+    completer.setModel(slm);
+    completer.setCompletionMode(QCompleter::PopupCompletion);
+    le.setCompleter(&completer);
+    QShortcut *shortcut = new QShortcut(QKeySequence(Qt::ALT + Qt::Key_S), &le);
+    QObject::connect(shortcut, &QShortcut::activated, &le, &QLineEdit::clear);
+    le.setFocus();
+    le.show();
+
+    QVERIFY(QTest::qWaitForWindowActive(&le));
+    QCOMPARE(QApplication::focusWidget(), &le);
+    QTest::keyEvent(QTest::Press, QApplication::focusWidget(), Qt::Key_A);
+
+    QCOMPARE(le.text(), QString::fromLocal8Bit("a"));
+    QTest::keyEvent(QTest::Press, QApplication::focusWidget(), Qt::Key_Alt);
+    QTest::keyEvent(QTest::Press, QApplication::focusWidget(), Qt::Key_S, Qt::AltModifier);
+    QCOMPARE(le.text(), QString());
+}
+
 QTEST_MAIN(tst_QShortcut)
 #include "tst_qshortcut.moc"