diff --git a/src/manage.c b/src/manage.c
index f7769c3b..72c7bce1 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -326,6 +326,8 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
 
                         new->container = t_ws->table[t_ws->current_col][t_ws->current_row];
                         new->workspace = t_ws;
+                        old_focused = new->container->currently_focused;
+
                         xcb_unmap_window(conn, new->frame);
                         break;
                 }