diff --git a/openbox/client.c b/openbox/client.c
index 257b480c..8dfd8e52 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -365,6 +365,10 @@ void client_manage(Window window)
         event_halt_focus_delay();
 
         client_focus(self);
+        /* since focus can change the stacking orders, if we focus the window
+           then the standard raise it gets is not enough, we need to queue one
+           for after the focus change takes place */
+        client_raise(self);
     }
 
     /* client_activate does this but we aret using it so we have to do it