Merge branch 'main' into leolost/explicit-override-window-group

Author: zeebok

data/gala.metainfo.xml.in

@@ -27,7 +27,7 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="8.5.0" date="2026-05-01" urgency="medium">
+    <release version="8.5.0" date="2026-05-04" urgency="medium">
       <description>
         <p>Improvements:</p>
           <ul>

meson.build

@@ -1,6 +1,6 @@
 project('gala',
     'vala',
-    version: '8.4.2',
+    version: '8.5.0',
     meson_version: '>= 0.59.0',
     license: 'GPL3',
     default_options: [

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -278,6 +278,12 @@ public class Gala.MultitaskingView : Root, RootTarget, ActivatableComponent {
                 } else {
                     target_workspace.activate (display.get_current_time ());
                 }
+
+                /* Activating a workspace will set the input focus to the stage so recapture it
+                   (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 ();
+
                 break;
 
             default: