1 files changed, 9 insertions, 8 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index d35cbeef..071ef020 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -658,7 +658,8 @@ void seat_set_focus_layer(struct sway_seat *seat,
                 struct wlr_layer_surface *layer) {
         if (!layer && seat->focused_layer) {
                 seat->focused_layer = NULL;
-                struct sway_container *previous = seat_get_focus(seat);
+                struct sway_container *previous =
+                        seat_get_focus_inactive(seat, &root_container);
                 if (previous) {
                         wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous,
                                         container_type_to_str(previous->type), previous->name);
@@ -728,14 +729,14 @@ struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
 
 struct sway_container *seat_get_active_child(struct sway_seat *seat,
                 struct sway_container *container) {
-        struct sway_container *focus = seat_get_focus_inactive(seat, container);
-        if (!focus) {
-                return NULL;
-        }
-        while (focus->parent != container) {
-                focus = focus->parent;
+        struct sway_seat_container *current = NULL;
+        wl_list_for_each(current, &seat->focus_stack, link) {
+                if (current->container->parent == container &&
+                                current->container->layout != L_FLOATING) {
+                        return current->container;
+                }
         }
-        return focus;
+        return NULL;
 }
 
 struct sway_container *seat_get_focus(struct sway_seat *seat) {