diff --git a/manage.cpp b/manage.cpp
index f4bac4e3c0..55e89c527d 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -45,7 +45,7 @@ namespace KWin
 bool Client::manage( Window w, bool isMapped )
     {
     StackingUpdatesBlocker stacking_blocker( workspace() );
-    
+
     //Scripting call. Does not use a signal/slot mechanism
     //as ensuring connections was a bit difficult between
     //so many clients and the workspace
@@ -207,7 +207,7 @@ bool Client::manage( Window w, bool isMapped )
             desk = info->desktop(); // Window had the initial desktop property, force it
         if( desktop() == 0 && asn_valid && asn_data.desktop() != 0 )
             desk = asn_data.desktop();
-        if (!isMapped &&  isNormalWindow() && isOnAllActivities()) {
+        if (!isMapped && !noborder && isNormalWindow() && isOnAllActivities()) {
             //a new, regular window, when we're not recovering from a crash,
             //and it hasn't got an activity. let's try giving it the current one.
             //TODO: decide whether to keep this before the 4.6 release