1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickshortcutcontext.cpp b/src/quicktemplates2/qquickshortcutcontext.cpp
index b44c723b..b491cab2 100644
--- a/src/quicktemplates2/qquickshortcutcontext.cpp
+++ b/src/quicktemplates2/qquickshortcutcontext.cpp
@@ -42,6 +42,7 @@
 #include "qquickmenubaritem_p.h"
 
 #include <QtGui/qguiapplication.h>
+#include <QtQuick/qquickrendercontrol.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -84,6 +85,8 @@ bool QQuickShortcutContext::matcher(QObject *obj, Qt::ShortcutContext context)
                 item = popup->popupItem();
             }
         }
+        if (QWindow *renderWindow = QQuickRenderControl::renderWindowFor(qobject_cast<QQuickWindow *>(obj)))
+            obj = renderWindow;
         return obj && obj == QGuiApplication::focusWindow() && !isBlockedByPopup(item);
     default:
         return false;