diff --git a/Servers/WindowServer/AppletManager.cpp b/Servers/WindowServer/AppletManager.cpp
index 382222a1d70..16cdf4c9da0 100644
--- a/Servers/WindowServer/AppletManager.cpp
+++ b/Servers/WindowServer/AppletManager.cpp
@@ -71,6 +71,11 @@ void AppletManager::add_applet(Window& applet)
 {
     m_applets.append(applet.make_weak_ptr());
 
+    // Prune any dead weak pointers from the applet list.
+    m_applets.remove_all_matching([](auto& entry) {
+        return entry.is_null();
+    });
+
     quick_sort(m_applets, [](auto& a, auto& b) {
         auto index_a = order_vector.find_first_index(a->title());
         auto index_b = order_vector.find_first_index(b->title());
diff --git a/Servers/WindowServer/ClientConnection.cpp b/Servers/WindowServer/ClientConnection.cpp
index 4b0449d7713..a94b9ea4ac6 100644
--- a/Servers/WindowServer/ClientConnection.cpp
+++ b/Servers/WindowServer/ClientConnection.cpp
@@ -81,8 +81,11 @@ ClientConnection::~ClientConnection()
 {
     MenuManager::the().close_all_menus_from_client({}, *this);
     auto windows = move(m_windows);
-    for (auto& window : windows)
+    for (auto& window : windows) {
         window.value->detach_client({});
+        if (window.value->type() == WindowType::MenuApplet)
+            AppletManager::the().remove_applet(window.value);
+    }
 }
 
 void ClientConnection::die()