diff --git a/src/Screen.cc b/src/Screen.cc
index a1cae41f..235a04a7 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2221,6 +2221,12 @@ void BScreen::shutdown(void) {
   while(! windowList.empty())
     unmanageWindow(windowList.front(), True);
 
+  while(! desktopWindowList.empty()) {
+    BlackboxWindow *win = blackbox->searchWindow(desktopWindowList.front());
+    assert(win);
+    unmanageWindow(win, True);
+  }
+
   slit->shutdown();
 }