1 files changed, 3 insertions, 0 deletions
diff --git a/src/input/mod.rs b/src/input/mod.rs
index 1a64930f..263f533d 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -1469,16 +1469,19 @@ impl State {
             }
             Action::FocusFloating => {
                 self.niri.layout.focus_floating();
+                self.maybe_warp_cursor_to_focus();
                 // FIXME: granular
                 self.niri.queue_redraw_all();
             }
             Action::FocusTiling => {
                 self.niri.layout.focus_tiling();
+                self.maybe_warp_cursor_to_focus();
                 // FIXME: granular
                 self.niri.queue_redraw_all();
             }
             Action::SwitchFocusBetweenFloatingAndTiling => {
                 self.niri.layout.switch_focus_floating_tiling();
+                self.maybe_warp_cursor_to_focus();
                 // FIXME: granular
                 self.niri.queue_redraw_all();
             }