diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp
index dbcd170d..e656f241 100644
--- a/src/lib/component/controller/GraphController.cpp
+++ b/src/lib/component/controller/GraphController.cpp
@@ -77,7 +77,10 @@ void GraphController::handleMessage(MessageActivateTokens* message)
 		deactivateNodesRecursive(&m_dummyNodes);
 	}
 
-	bundleNodes();
+	if (m_activeNodeIds.size() == 1)
+	{
+		bundleNodes();
+	}
 
 	layoutNesting();
 	layoutGraph();