3 files changed, 19 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index fd04ecf474..b22fa4ec58 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -120,7 +120,7 @@ void QIOSWindow::setVisible(bool visible)
 
     if (visible && shouldAutoActivateWindow()) {
         requestActivateWindow();
-    } else if (!visible && qGuiApp->focusWindow() == window()) {
+    } else if (!visible && [m_view isActiveWindow]) {
         // Our window was active/focus window but now hidden, so relinquish
         // focus to the next possible window in the stack.
         NSArray *subviews = m_view.viewController.view.subviews;
diff --git a/src/plugins/platforms/ios/quiview.h b/src/plugins/platforms/ios/quiview.h
index 065c52f881..dfe0927b00 100644
--- a/src/plugins/platforms/ios/quiview.h
+++ b/src/plugins/platforms/ios/quiview.h
@@ -56,6 +56,7 @@ class QIOSWindow;
 
 - (id)initWithQIOSWindow:(QIOSWindow *)window;
 - (void)sendUpdatedExposeEvent;
+- (BOOL)isActiveWindow;
 @end
 
 @interface QUIView (Accessibility)
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm
index a56db1d6f5..8be3515cb5 100644
--- a/src/plugins/platforms/ios/quiview.mm
+++ b/src/plugins/platforms/ios/quiview.mm
@@ -261,6 +261,23 @@
     return YES;
 }
 
+- (BOOL)isActiveWindow
+{
+    // Normally this is determined exclusivly by being firstResponder, but
+    // since we employ a separate first responder for text input we need to
+    // handle both cases as this view being the active Qt window.
+
+    if ([self isFirstResponder])
+        return YES;
+
+    UIResponder *firstResponder = [UIResponder currentFirstResponder];
+    if ([firstResponder isKindOfClass:[QIOSTextInputResponder class]]
+        && [firstResponder nextResponder] == self)
+        return YES;
+
+    return NO;
+}
+
 // -------------------------------------------------------------------------