diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java
index da39a8a5e..fbb6a7bb4 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java
@@ -87,7 +87,7 @@ public class AbstractSyntaxController {
 
 	private Panel addPanel(TreeItem item, Panel parentPanel)
 	{
-		HorizontalPanel wordsPanel = new HorizontalPanel();
+		FlowPanel wordsPanel = new FlowPanel();
 		wordsPanel.setStylePrimaryName("my-WordsPanel");
 		panels.put(wordsPanel,item);
 
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Editor.css b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Editor.css
index 3ddb3d442..5c641665e 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Editor.css
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Editor.css
@@ -17,6 +17,7 @@ body {
 }
 
 .my-WordLabel {
+  float: left;
   padding: 2px;
 }