diff --git a/manage.cpp b/manage.cpp
index 08a50a14eb..614fe50c34 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -330,7 +330,7 @@ bool Client::manage(Window w, bool isMapped)
                 }
             }
         }
-        if (autogrouping && !tab_group && !isMapped && !session) {
+        if (!(tab_group || isMapped || session)) {
             // Attempt to automatically group similar windows
             Client* similar = findAutogroupCandidate();
             if (similar && !similar->noBorder()) {