diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp
index 6914f64f8ec..7482f1587ac 100644
--- a/src/widgets/kernel/qwindowcontainer.cpp
+++ b/src/widgets/kernel/qwindowcontainer.cpp
@@ -222,6 +222,11 @@ void QWindowContainer::focusWindowChanged(QWindow *focusWindow)
 {
     Q_D(QWindowContainer);
     d->oldFocusWindow = focusWindow;
+    if (focusWindow == d->window) {
+        QWidget *widget = QApplication::focusWidget();
+        if (widget)
+            widget->clearFocus();
+    }
 }
 
 /*!