diff --git a/manage.cpp b/manage.cpp
index 606fd595a1..d55310f1f4 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -276,7 +276,8 @@ bool Client::manage( Window w, bool isMapped )
         placementDone = TRUE;
         }
 
-    if (( !isSpecialWindow() || isToolbar()) && isMovable())
+    if( !isMapped && !session // trust position from session or if already mapped
+        && ( !isSpecialWindow() || isToolbar()) && isMovable())
         keepInArea( area );
 
     XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask );