1 files changed, 4 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 1a4c90a4..207a886b 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -450,12 +450,11 @@ bool QQuickPopupPrivate::prepareExitTransition()
         return false;
 
     if (transitionState != ExitTransition) {
-        if (focus) {
-            // The setFocus(false) call below removes any active focus before we're
-            // able to check it in finalizeExitTransition.
-            hadActiveFocusBeforeExitTransition = popupItem->hasActiveFocus();
+        // The setFocus(false) call below removes any active focus before we're
+        // able to check it in finalizeExitTransition.
+        hadActiveFocusBeforeExitTransition = popupItem->hasActiveFocus();
+        if (focus)
             popupItem->setFocus(false);
-        }
         transitionState = ExitTransition;
         hideOverlay();
         emit q->aboutToHide();