diff --git a/group.cpp b/group.cpp
index 53edde73ea..a11aa0d2ce 100644
--- a/group.cpp
+++ b/group.cpp
@@ -340,7 +340,7 @@ void Client::setTransient( Window new_transient_for_id )
             for( ClientList::ConstIterator it = group()->members().begin();
                  it != group()->members().end();
                  ++it )
-                if( !(*it)->groupTransient())
+                if( *it != this )
                     (*it)->addTransient( this );
             }
         else if( transient_for_id != None )
@@ -714,6 +714,8 @@ void Client::checkGroup()
             {
             if( !(*it)->groupTransient())  // and its transient for group transients in the new group
                 continue;
+            if( *it == this )
+                continue;
             addTransient( *it );
 	    }
         checkGroupTransients();