diff --git a/workspace.cpp b/workspace.cpp
index 8bedd0fa2f..3951aa807f 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -745,7 +745,7 @@ bool Workspace::destroyClient( Client* c)
     if ( !c )
         return FALSE;
 
-    if (c == popup_client)
+    if (c == popup_client && popup)
         popup->close();
 
     storeFakeSessionInfo( c );