2 files changed, 5 insertions, 3 deletions

diff --git a/sway/border.c b/sway/border.c
index 55628972..d17d8d0c 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -281,7 +281,9 @@ void update_tabbed_stacked_titlebars(swayc_t *c, cairo_t *cr, struct wlc_geometr
                         update_tabbed_stacked_titlebars(child, cr, g, focused, focused_inactive);
                 }
         } else {
-                if (focused == c) {
+                bool is_child_of_focused = swayc_is_child_of(c, get_focused_container(&root_container));
+
+                if (focused == c || is_child_of_focused) {
                         render_title_bar(c, cr, g, &config->border_colors.focused);
                 } else if (focused_inactive == c) {
                         render_title_bar(c, cr, g, &config->border_colors.focused_inactive);
diff --git a/sway/commands.c b/sway/commands.c
index 56701634..d572afa0 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1927,8 +1927,8 @@ static struct cmd_results *cmd_kill(int argc, char **argv) {
         if (config->reading) return cmd_results_new(CMD_FAILURE, "kill", "Can't be used in config file.");
         if (!config->active) return cmd_results_new(CMD_FAILURE, "kill", "Can only be used when sway is running.");
 
-        swayc_t *view = get_focused_container(&root_container);
-        wlc_view_close(view->handle);
+        swayc_t *container = get_focused_container(&root_container);
+        close_views(container);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }