1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 57b93036..d5a0ccf4 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -451,7 +451,7 @@ bool QQuickPopupPrivate::prepareExitTransition()
     if (transitionState == ExitTransition && transitionManager.isRunning())
         return false;
 
-    if (transitionState != ExitTransition) {
+    if (transitionState != ExitTransition && !hadActiveFocusBeforeExitTransition) {
         // The setFocus(false) call below removes any active focus before we're
         // able to check it in finalizeExitTransition.
         hadActiveFocusBeforeExitTransition = popupItem->hasActiveFocus();