diff --git a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateSettingsComponent.kt b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateSettingsComponent.kt
index 939054f..d14bb25 100644
--- a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateSettingsComponent.kt
+++ b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateSettingsComponent.kt
@@ -5,6 +5,7 @@ import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.ui.components.JBScrollPane
 import com.intellij.ui.table.JBTable
 import java.awt.BorderLayout
 import java.awt.FlowLayout
@@ -20,14 +21,13 @@ class FilenameTemplateSettingsComponent(val filenameTemplates: ArrayList<Filenam
 
         filenameTemplateTable = JBTable(filenameTemplateTableModel)
         filenameTemplateTable.autoCreateRowSorter = false
+        val filenameTemplateTableScrollPane = JBScrollPane(filenameTemplateTable)
 
-        panel.add(filenameTemplateTable, BorderLayout.CENTER)
+        panel.add(filenameTemplateTableScrollPane, BorderLayout.CENTER)
         panel.add(createToolbar(filenameTemplateTable), BorderLayout.EAST)
     }
 
     private fun createToolbar(table: JBTable): JPanel {
-        val panel = JPanel()
-        panel.layout = FlowLayout(FlowLayout.LEFT)
         val actionGroup = DefaultActionGroup()
         actionGroup.add(object : AnAction("Add", "Add new filename template", AllIcons.General.Add) {
             override fun actionPerformed(e: AnActionEvent) {
@@ -49,7 +49,11 @@ class FilenameTemplateSettingsComponent(val filenameTemplates: ArrayList<Filenam
                 filenameTemplateTableModel.moveRowsDown(table.selectedRows)
             }
         })
+
         val toolbar = ActionManager.getInstance().createActionToolbar("MyToolbar", actionGroup, false)
+
+        val panel = JPanel()
+        panel.layout = FlowLayout(FlowLayout.LEFT)
         panel.add(toolbar.component)
         return panel
     }