diff --git a/client.cpp b/client.cpp
index ed59362d9b..258938d3fb 100644
--- a/client.cpp
+++ b/client.cpp
@@ -562,6 +562,7 @@ void Client::manage( bool isMapped )
     setMappingState( state );
     if ( state == NormalState && isOnDesktop( workspace()->currentDesktop() ) ) {
 	Events::raise( isTransient() ? Events::TransNew : Events::New );
+	workspace()->raiseClient( this ); // ensure constrains
 	show();
 	if ( options->focusPolicyIsReasonable() && wantsTabFocus() )
 	    workspace()->requestFocus( this );
diff --git a/workspace.cpp b/workspace.cpp
index 4f776fb4f7..6f215cd2f9 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -259,7 +259,7 @@ Workspace::Workspace( bool restore )
     grabKey(XK_Tab, ControlMask | ShiftMask);
     createKeybindings();
     tab_box = new TabBox( this );
-    
+
     init();
 }
 
@@ -348,10 +348,7 @@ void Workspace::init()
     }
 
     updateClientArea();
-    
-    // initialize stacking
-    if ( stacking_order.last() )
- 	raiseClient( stacking_order.last() );
+
 }
 
 Workspace::~Workspace()