diff --git a/src/tree.c b/src/tree.c
index 240c22a6..0d0c2e9f 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -220,12 +220,13 @@ bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) {
     if (was_mapped || con == focused) {
         if ((kill_window != DONT_KILL_WINDOW) || !dont_kill_parent || con == focused) {
             DLOG("focusing %p / %s\n", next, next->name);
-            /* TODO: check if the container (or one of its children) was focused */
             if (next->type == CT_DOCKAREA) {
                 /* Instead of focusing the dockarea, we need to restore focus to the workspace */
                 con_focus(con_descend_focused(output_get_content(next->parent)));
             } else {
-                con_focus(next);
+                if (con != focused)
+                    DLOG("not changing focus, the container was not focused before\n");
+                else con_focus(next);
             }
         }
         else {