diff --git a/source/Magritte-GToolkit/MATokenSelectorElement.class.st b/source/Magritte-GToolkit/MATokenSelectorElement.class.st
index 1d8aed44..b3878cdd 100644
--- a/source/Magritte-GToolkit/MATokenSelectorElement.class.st
+++ b/source/Magritte-GToolkit/MATokenSelectorElement.class.st
@@ -110,8 +110,8 @@ MATokenSelectorElement >> relationDescription: anObject [
 MATokenSelectorElement >> tokenContainer [
 	tokenContainer ifNotNil: [ ^ tokenContainer ].
 	
-	^ tokenContainer := BrHorizontalPane new
+	^ tokenContainer := BrHorizontalFlow new
 		vFitContent;
-		hFitContent;
+		hMatchParent;
 		yourself
 ]