1 files changed, 10 insertions, 1 deletions

diff --git a/sway/focus.c b/sway/focus.c
index cdc9a888..b4dfc423 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -141,9 +141,18 @@ bool set_focused_container(swayc_t *c) {
                         // set focus if view_focus is unlocked
                         if (!locked_view_focus) {
                                 wlc_view_focus(p->handle);
-                                update_view_border(p);
+                                if (p->parent->layout != L_TABBED
+                                        && p->parent->layout != L_STACKED) {
+                                        update_view_border(p);
+                                }
                         }
                 }
+
+                // rearrange if parent container is tabbed/stacked
+                swayc_t *parent = swayc_tabbed_stacked_parent(p);
+                if (parent != NULL) {
+                        arrange_windows(parent, -1, -1);
+                }
         } else if (p->type == C_WORKSPACE) {
                 // remove previous focus if view_focus is unlocked
                 if (!locked_view_focus) {