1 files changed, 6 insertions, 2 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index daf5b160..03ed638e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -772,7 +772,9 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
         }
 
         if (last_focus) {
-                if (config->mouse_warping && warp && new_output != last_output) {
+                if (config->mouse_warping && warp &&
+                                (new_output != last_output ||
+                                config->mouse_warping == WARP_CONTAINER)) {
                         double x = 0;
                         double y = 0;
                         if (container) {
@@ -782,9 +784,11 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
                                 x = new_workspace->x + new_workspace->width / 2.0;
                                 y = new_workspace->y + new_workspace->height / 2.0;
                         }
+
                         if (!wlr_output_layout_contains_point(root->output_layout,
                                         new_output->wlr_output, seat->cursor->cursor->x,
-                                        seat->cursor->cursor->y)) {
+                                        seat->cursor->cursor->y)
+                                        || config->mouse_warping == WARP_CONTAINER) {
                                 wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
                                 cursor_send_pointer_motion(seat->cursor, 0, true);
                         }