diff --git a/workspace.cpp b/workspace.cpp
index 218160d6f4..177eb1e666 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -553,7 +553,11 @@ void Workspace::updateCurrentTopMenu()
 
 //    kdDebug() << "CURRENT TOPMENU:" << menubar << ":" << active_client << endl;
     if ( menubar )
+        {
+        if( active_client && !menubar->isOnDesktop( active_client->desktop()))
+            menubar->setDesktop( active_client->desktop());
         menubar->hideClient( false );
+        }
 
     // ... then hide the other ones. Avoids flickers.
 #if 0