diff --git a/workspace.cpp b/workspace.cpp
index b6e6cb5caf..d1482ae031 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1520,6 +1520,10 @@ void Workspace::raiseClient( Client* c )
 {
     if ( !c )
 	return;
+
+    if ( tab_box->isVisible() )
+	return;
+    
     ClientList saveset;
 
     if ( c == desktop_client ) {