diff --git a/openbox/screen.c b/openbox/screen.c
index eff8674b..45246297 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -190,7 +190,6 @@ gboolean screen_annex()
         return FALSE;
     }
 
-
     screen_set_root_cursor();
 
     /* set the OPENBOX_PID hint */
@@ -506,12 +505,12 @@ void screen_set_desktop(guint num, gboolean dofocus)
            to call xsetinputfocus on the window ourselves. otherwise there is
            no guarantee the window will actually take focus.. */
         if (c->can_focus) {
-            /* do this here so that if you switch desktops to a window with
-               helper windows then the helper windows won't flash */
-            client_bring_helper_windows(c);
             /* reduce flicker by hiliting now rather than waiting for the
                server FocusIn event */
             frame_adjust_focus(c->frame, TRUE);
+            /* do this here so that if you switch desktops to a window with
+               helper windows then the helper windows won't flash */
+            client_bring_helper_windows(c);
         }
     }