diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 35ca93a481..a79e160582 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2024,7 +2024,10 @@ gtk_window_root_set_focus (GtkRoot   *root,
     return;
 
   if (focus == priv->focus_widget)
-    return;
+    {
+      priv->move_focus = FALSE;
+      return;
+    }
 
   if (priv->focus_widget)
     old_focus = g_object_ref (priv->focus_widget);