diff --git a/workspace.cpp b/workspace.cpp
index d109ae8894..3ea946d9cc 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -3183,8 +3183,11 @@ void Workspace::sendToDesktop( int desk )
  */
 void Workspace::slotWindowOperations()
 {
-    if ( !active_client || desktopWidget())
+    if ( !active_client )
         return;
+    if ( active_client->isDesktop())
+        return;
+
     QPopupMenu* p = clientPopup( active_client );
     Client* c = active_client;
     p->exec( active_client->mapToGlobal( active_client->windowWrapper()->geometry().topLeft() ) );