diff --git a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.form b/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.form
index c448049..de99827 100644
--- a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.form
+++ b/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.form
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.marhali.easyi18n.ui.tabs.TreeView">
-  <grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
+  <grid id="27dc6" binding="rootPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="79692" binding="toolBarPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
+      <grid id="4e80a" binding="containerPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints border-constraint="Center"/>
         <properties/>
         <border type="none"/>
         <children/>
       </grid>
-      <grid id="4e80a" binding="containerPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
+      <grid id="79692" binding="toolBarPanel" layout-manager="FlowLayout" hgap="1" vgap="1" flow-align="1">
+        <constraints border-constraint="East"/>
+        <properties>
+          <alignmentX value="0.5"/>
+        </properties>
         <border type="none"/>
         <children/>
       </grid>
diff --git a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.java
index 4f744d6..4fc7a0b 100644
--- a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.java
+++ b/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.java
@@ -4,6 +4,7 @@ import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
+import com.intellij.ui.components.JBScrollPane;
 import com.intellij.ui.treeStructure.Tree;
 
 import de.marhali.easyi18n.service.DataStore;
@@ -54,7 +55,7 @@ public class TreeView implements DataSynchronizer {
         tree.addMouseListener(new PopupClickListener(this::handlePopup));
         tree.addKeyListener(new DeleteKeyListener(handleDeleteKey()));
 
-        containerPanel.add(tree);
+        containerPanel.add(new JBScrollPane(tree));
         placeActions();
     }