diff --git a/src/Widgets/MultitaskingView/MultitaskingView.vala b/src/Widgets/MultitaskingView/MultitaskingView.vala index 989eb1874..6392ba779 100644 --- a/src/Widgets/MultitaskingView/MultitaskingView.vala +++ b/src/Widgets/MultitaskingView/MultitaskingView.vala @@ -307,10 +307,12 @@ public class Gala.MultitaskingView : Root, RootTarget { target_workspace.activate (display.get_current_time ()); } - /* Activating a workspace will set the input focus to the stage so recapture it + /* Activating a workspace will set the input focus to the stage so recapture it if we are open (Gala.Root will automatically recapture it if we try to move the focus but we want it right away for escape to work) */ - grab_key_focus (); + if (opened) { + grab_key_focus (); + } break;