diff --git a/src/manage.c b/src/manage.c
index df0cd934..8b56fd6e 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -698,7 +698,7 @@ out:
 Con *remanage_window(Con *con) {
     Match *match;
     Con *nc = con_for_window(croot, con->window, &match);
-    if (nc == NULL || nc->window == con->window) {
+    if (nc == NULL || nc->window == NULL || nc->window == con->window) {
         run_assignments(con->window);
         return con;
     }