diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 0f8202ea..72dc8700 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -163,8 +163,9 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 			}
 		} else {
 			// Don't switch focus on mouseover for stacked and tabbed layouts
-			if(c->parent && c->parent->layout != L_STACKED
-						 && c->parent->layout != L_TABBED) {
+			if(focus->parent == c->parent &&
+					(c->parent->layout != L_STACKED
+					|| c->parent->layout != L_TABBED)) {
 				seat_set_focus_warp(cursor->seat, c, false);
 			}
 		}