diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8b94ab..a99e756 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@
 ### Changed
 - Replace deprecated api methods
 
+### Fixed
+- Warning for unset target element inside tree-view toolbar
+
 ## [1.4.0]
 ### THANKS FOR OVER 1000 DOWNLOADS SO FAR!
 
diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java
index 069f975..69c63e7 100644
--- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java
+++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java
@@ -2,6 +2,7 @@ package de.marhali.easyi18n.tabs;
 
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.ActionToolbar;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.components.JBScrollPane;
@@ -68,10 +69,11 @@ public class TreeView implements DataSynchronizer {
         group.add(collapse);
         group.add(expand);
 
-        JComponent actionToolbar = ActionManager.getInstance()
-                .createActionToolbar("TranslationsActions", group, false).getComponent();
+        ActionToolbar actionToolbar = ActionManager.getInstance()
+                .createActionToolbar("TranslationsActions", group, false);
 
-        toolBarPanel.add(actionToolbar);
+        toolBarPanel.add(actionToolbar.getComponent());
+        actionToolbar.setTargetComponent(toolBarPanel);
     }
 
     @Override