diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000..e69de29b
diff --git a/src/input/mod.rs b/src/input/mod.rs
index cc171df1..b6b6b6c2 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -676,10 +676,7 @@ impl State {
                     0 => 9,
                     x => x - 1,
                 };
-                let _ = self
-                    .common
-                    .shell
-                    .activate(&current_output, workspace as usize);
+                Shell::activate_and_focus(self, seat, &current_output, workspace as usize)
             }
             Action::NextWorkspace => {
                 let current_output = seat.active_output();
@@ -690,7 +687,7 @@ impl State {
                     .active_num(&current_output)
                     .saturating_add(1);
                 // TODO: Possibly move to next output, if idx to large
-                let _ = self.common.shell.activate(&current_output, workspace);
+                Shell::activate_and_focus(self, seat, &current_output, workspace)
             }
             Action::PreviousWorkspace => {
                 let current_output = seat.active_output();
@@ -701,7 +698,7 @@ impl State {
                     .active_num(&current_output)
                     .saturating_sub(1);
                 // TODO: Possibly move to prev output, if idx < 0
-                let _ = self.common.shell.activate(&current_output, workspace);
+                Shell::activate_and_focus(self, seat, &current_output, workspace)
             }
             Action::LastWorkspace => {
                 let current_output = seat.active_output();
@@ -711,7 +708,7 @@ impl State {
                     .workspaces
                     .len(&current_output)
                     .saturating_sub(1);
-                let _ = self.common.shell.activate(&current_output, workspace);
+                Shell::activate_and_focus(self, seat, &current_output, workspace)
             }
             x @ Action::MoveToWorkspace(_) | x @ Action::SendToWorkspace(_) => {
                 let current_output = seat.active_output();
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 0ff4b8e6..eb12a3d6 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -1176,6 +1176,19 @@ impl Shell {
         }
     }
 
+    pub fn activate_and_focus(state: &mut State, seat: &Seat<State>, output: &Output, idx: usize) {
+        let _ = state.common.shell.activate(output, idx);
+
+        // without this the last window of the target workspace may not receive focus when switching
+        // from a workspace having focused fullscreen window (there may be other cases).
+        let workspace = state.common.shell.active_space(output);
+        if let Some(mapped) = workspace.focus_stack.get(seat).last() {
+            // TODO: There should probably be a `KeyboardFocusTargetRef<'a>` to avoid unnecessary
+            //       cloning.
+            Common::set_focus(state, Some(&(mapped.clone().into())), seat, None);
+        }
+    }
+
     pub fn move_current_window(
         state: &mut State,
         seat: &Seat<State>,