diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 842a5ff0ac..8394fc4546 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -11214,10 +11214,16 @@ gtk_window_activate_key (GtkWindow *window, if (window->priv->application) { - GtkWidget *focused_widget = gtk_window_get_focus (window); - if (focused_widget == NULL) - return FALSE; - GtkActionMuxer *muxer = _gtk_widget_get_action_muxer (focused_widget, FALSE); + GtkWidget *focused_widget; + GtkActionMuxer *muxer; + + focused_widget = gtk_window_get_focus (window); + + if (focused_widget) + muxer = _gtk_widget_get_action_muxer (focused_widget, FALSE); + else + muxer = _gtk_widget_get_action_muxer (GTK_WIDGET (window), FALSE); + if (muxer == NULL) return FALSE;