diff --git a/src/Screen.cc b/src/Screen.cc
index cebd21c0..99224350 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -310,6 +310,12 @@ BScreen::~BScreen(void) {
 
   std::for_each(netizenList.begin(), netizenList.end(), PointerAssassin());
 
+  while (! desktopWindowList.empty())
+    removeDesktopWindow(desktopWindowList[0]);
+
+  while (! systrayWindowList.empty())
+    removeSystrayWindow(systrayWindowList[0]);
+
   delete rootmenu;
   delete workspacemenu;
   delete iconmenu;