diff --git a/openbox/client.c b/openbox/client.c
index 2e0e442a..996c6b88 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -271,8 +271,10 @@ void client_manage(Window window)
            rules for focus */
         if ((config_focus_new &&
              (self->type == Type_Normal ||
-              (self->type == Type_Dialog && (group_foc ||
-                                             (!parent && !self->group))))) ||
+              (self->type == Type_Dialog &&
+               (group_foc ||
+                (!parent && (!self->group ||
+                             !self->group->members->next)))))) ||
             (parent && (client_focused(parent) ||
                         search_focus_tree(parent, parent)))) {
             client_focus(self);