diff --git a/openbox/client.c b/openbox/client.c
index ef6a0e1a..c475fba3 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -135,10 +135,11 @@ void client_manage_all()
     startup_stack_order = NULL;
     startup_stack_size = 0;
 
-    active = g_hash_table_lookup(client_map, &startup_active);
-    if (!active || !client_focus(active))
-        if (config_focus_new)
+    if (config_focus_new) {
+        active = g_hash_table_lookup(client_map, &startup_active);
+        if (!active || !client_focus(active))
             focus_fallback(Fallback_NoFocus);
+    }
 }
 
 void client_manage(Window window)