diff --git a/workspace.cpp b/workspace.cpp
index 3eb4f5060a..9a9ce51e2a 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -724,7 +724,7 @@ void Workspace::setActiveClient( Client* c )
 void Workspace::activateClient( Client* c)
 {
     if (!c->isOnDesktop(currentDesktop()) ) {
-	// TODO switch desktop
+	setCurrentDesktop( c->desktop() );
     }
     raiseClient( c );
     c->show();