diff --git a/workspace.cpp b/workspace.cpp
index 5e7b97d8aa..2b1d466ef5 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -878,6 +878,8 @@ void Workspace::raiseClient( Client* c )
 	    t2 = findClient( t->transientFor() );
 	    if ( t2 == c )
 		goto end;
+	    if ( t2 == t )
+		break;
 	    t = t2;
 	}
 	raiseClient( t );