--- metacity/src/window.c
+++ metacity/src/window.c
@@ -1814,7 +1814,6 @@
   if (!(window->input || window->take_focus))
     {
       *takes_focus = FALSE;
-      return;
     }
 
   /* Terminal usage may be different; some users intend to launch
@@ -1858,7 +1857,9 @@
     case META_WINDOW_NORMAL:
     case META_WINDOW_DIALOG:
     case META_WINDOW_MODAL_DIALOG:
-      /* The default is correct for these */
+      /* These kinds of windows never take focus nor are put on top by default */
+      *takes_focus = FALSE;
+      *places_on_top = FALSE;
       break;
     }
 }
