diff --git a/client.cpp b/client.cpp
index a2c2a51d6d..7f04ad530c 100644
--- a/client.cpp
+++ b/client.cpp
@@ -798,7 +798,8 @@ void Client::withdraw()
 {
     Events::raise( isTransient() ? Events::TransDelete : Events::Delete );
     setMappingState( WithdrawnState );
-//###     KWM::moveToDesktop( win, -1 ); // compatibility
+    info->setDesktop( 0 );
+    desk = 0;
     releaseWindow();
     workspace()->destroyClient( this );
 }
diff --git a/events.cpp b/events.cpp
index bfde1ef0df..50651f673c 100644
--- a/events.cpp
+++ b/events.cpp
@@ -11,7 +11,7 @@ void Events::raise( Event e )
     static bool forgetIt = FALSE;
     if ( forgetIt )
 	return; // no connection was possible, don't try each time
-    
+
     QString event;
     switch ( e ) {
     case Close: