diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h
index ae1f428680..41c7e00f62 100644
--- a/Applications/Taskbar/WindowList.h
+++ b/Applications/Taskbar/WindowList.h
@@ -15,6 +15,8 @@ public:
 
     ~Window()
     {
+        if (m_button)
+            m_button->remove_from_parent();
     }
 
     WindowIdentifier identifier() const { return m_identifier; }