diff --git a/activation.cpp b/activation.cpp
index 97ff202722..5b5edb7392 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -365,15 +365,10 @@ void Workspace::takeActivity( Client* c, int flags, bool handled )
         flags &= ~ActivityFocus;
         handled = false; // no point, can't get clicks
         }
+    if( c->clientGroup() && c->clientGroup()->visible() != c )
+        c->clientGroup()->setVisible( c );
     if( !c->isShown( true )) // shouldn't happen, call activateClient() if needed
         {
-        int group_size = c->clientGroup()->clients().count();
-        if( group_size > 1 && c->clientGroup()->visible() != c ) // the tab is hidden, make it visible and call this function again
-            {
-            c->clientGroup()->setVisible( c );
-            takeActivity( c, flags, handled );
-            return;
-            }
         kWarning( 1212 ) << "takeActivity: not shown" ;
         return;
         }