diff --git a/useractions.cpp b/useractions.cpp
index d9c53d51cf..6dd554573d 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -897,7 +897,9 @@ void Workspace::showWindowMenu( const QRect &pos, Client* cl )
 	else
 	    p->exec( QPoint( x, pos.top() - popupHeight ) );
         }
-    closeActivePopup();
+    // active popup may be already changed (e.g. the window shortcut dialog)
+    if( active_popup == p )
+        closeActivePopup();
     }
 
 /*!
diff --git a/utils.cpp b/utils.cpp
index cd3cdae33e..e58b1efb11 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -23,6 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <kxerrorhandler.h>
 #include <assert.h>
+#include <kdebug.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>