diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 874b053d57..eb551bf834 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8625,7 +8625,7 @@ gtk_window_focus (GtkWidget        *widget,
   if (old_focus_child)
     {
       if (gtk_widget_child_focus (old_focus_child, direction))
-	return TRUE;
+        return TRUE;
     }
 
   if (priv->focus_widget)
@@ -8668,7 +8668,9 @@ gtk_window_focus (GtkWidget        *widget,
                priv->title_box != child &&
                gtk_widget_child_focus (priv->title_box, direction))
         return TRUE;
-
+      else if (priv->title_box == child &&
+               gtk_widget_child_focus (gtk_bin_get_child (bin), direction))
+        return TRUE;
     }
 
   return FALSE;