diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a3b480257e..bac47a970c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1562,6 +1562,7 @@ ensure_title_box (GtkWindow *window)
       gtk_widget_set_name (button, "gtk-window-decorated-minimize-button");
       image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU);
       gtk_widget_set_tooltip_text (button, _("Minimize Window"));
+      GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
       gtk_container_add (GTK_CONTAINER (button), image);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
       priv->min_button = button;
@@ -1573,6 +1574,7 @@ ensure_title_box (GtkWindow *window)
       gtk_widget_set_name (button, "gtk-window-decorated-maximize-button");
       image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU);
       gtk_widget_set_tooltip_text (button, _("Maximize Window"));
+      GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
       gtk_container_add (GTK_CONTAINER (button), image);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
       priv->max_button = button;
@@ -1584,6 +1586,7 @@ ensure_title_box (GtkWindow *window)
       gtk_widget_set_name (button, "gtk-window-decorated-close-button");
       image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
       gtk_widget_set_tooltip_text (button, _("Close Window"));
+      GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
       gtk_container_add (GTK_CONTAINER (button), image);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
       priv->close_button = button;