diff --git a/workspace.cpp b/workspace.cpp
index 0ba8f312a5..a3e75af434 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -764,6 +764,10 @@ bool Workspace::hasClient(Client* c)
             return TRUE;
     }
 
+    for ( ClientList::ConstIterator it = desktops.begin(); it != desktops.end(); ++it) {
+        if ( (*it) == c )
+            return TRUE;
+    }
     return FALSE;
 }