diff --git a/openbox/client.c b/openbox/client.c
index a9f32044..a473fdb1 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -258,7 +258,7 @@ void client_manage(Window window)
         /* note the check against Type_Normal, not client_normal(self), which
            would also include dialog types. in this case we want more strict
            rules for focus */
-        if ((config_focus_new && client_normal(self)) ||
+        if ((config_focus_new && self->type == Type_Normal) ||
             (parent && (client_focused(parent) ||
                         search_focus_tree(parent, parent)))) {
             client_focus(self);