1 files changed, 3 insertions, 6 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 96ac7b33..79f6ec46 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -109,9 +109,6 @@ static struct sway_container *container_at_coords(
         }
 
         struct sway_container *c;
-        if ((c = floating_container_at(lx, ly, surface, sx, sy))) {
-                return c;
-        }
         if ((c = container_at(ws, lx, ly, surface, sx, sy))) {
                 return c;
         }
@@ -349,7 +346,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
                                 output = container_parent(c, C_OUTPUT);
                         }
                         if (output != focus) {
-                                seat_set_focus_warp(seat, c, false);
+                                seat_set_focus_warp(seat, c, false, true);
                         }
                 } else if (c->type == C_VIEW) {
                         // Focus c if the following are true:
@@ -359,13 +356,13 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
                         if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) &&
                                         c != prev_c &&
                                         view_is_visible(c->sway_view)) {
-                                seat_set_focus_warp(seat, c, false);
+                                seat_set_focus_warp(seat, c, false, true);
                         } else {
                                 struct sway_container *next_focus =
                                         seat_get_focus_inactive(seat, &root_container);
                                 if (next_focus && next_focus->type == C_VIEW &&
                                                 view_is_visible(next_focus->sway_view)) {
-                                        seat_set_focus_warp(seat, next_focus, false);
+                                        seat_set_focus_warp(seat, next_focus, false, true);
                                 }
                         }
                 }