diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 496bfd5d..31210a5a 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -56,6 +56,9 @@ void sway_seat_configure_xcursor(struct sway_seat *seat);
 
 void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container);
 
+void sway_seat_set_focus_warp(struct sway_seat *seat,
+		struct sway_container *container, bool warp);
+
 struct sway_container *sway_seat_get_focus(struct sway_seat *seat);
 
 /**
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 2a096033..4a3f558d 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -120,9 +120,6 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
 	return NULL;
 }
 
-void _sway_seat_set_focus(struct sway_seat *seat,
-		struct sway_container *container, bool warp);
-
 static void cursor_send_pointer_motion(struct sway_cursor *cursor,
 		uint32_t time) {
 	struct wlr_seat *seat = cursor->seat->wlr_seat;
@@ -130,7 +127,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
 	double sx, sy;
 	struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy);
 	if (c && config->focus_follows_mouse) {
-		_sway_seat_set_focus(cursor->seat, c, false);
+		sway_seat_set_focus_warp(cursor->seat, c, false);
 	}
 
 	// reset cursor if switching between clients
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 4e7e018d..9aa34aca 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,5 +1,6 @@
 #define _XOPEN_SOURCE 700
 #include <wlr/types/wlr_cursor.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "sway/tree/container.h"
 #include "sway/input/seat.h"
@@ -291,7 +292,7 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
 		seat->cursor->cursor->y);
 }
 
-void _sway_seat_set_focus(struct sway_seat *seat,
+void sway_seat_set_focus_warp(struct sway_seat *seat,
 		struct sway_container *container, bool warp) {
 	struct sway_container *last_focus = sway_seat_get_focus(seat);
 
@@ -351,12 +352,14 @@ void _sway_seat_set_focus(struct sway_seat *seat,
 		}
 		if (new_output && last_output && new_output != last_output
 				&& config->mouse_warping && warp) {
-			wlr_log(L_DEBUG, "warpin the mouse baby");
 			struct wlr_output *output = new_output->sway_output->wlr_output;
-			// TODO: Change container coords to layout coords
 			double x = container->x + output->lx + container->width / 2.0;
 			double y = container->y + output->ly + container->height / 2.0;
-			wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
+			if (!wlr_output_layout_contains_point(
+					root_container.sway_root->output_layout,
+					output, seat->cursor->cursor->x, seat->cursor->cursor->y)) {
+				wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
+			}
 		}
 	}
 
@@ -371,7 +374,7 @@ void _sway_seat_set_focus(struct sway_seat *seat,
 
 void sway_seat_set_focus(struct sway_seat *seat,
 		struct sway_container *container) {
-	_sway_seat_set_focus(seat, container, true);
+	sway_seat_set_focus_warp(seat, container, true);
 }
 
 struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) {