diff --git a/addons/ca_level_generator/CaLevelGeneratorPlugin.cs b/addons/ca_level_generator/CaLevelGeneratorPlugin.cs
index d8b6bed..e71ce36 100644
--- a/addons/ca_level_generator/CaLevelGeneratorPlugin.cs
+++ b/addons/ca_level_generator/CaLevelGeneratorPlugin.cs
@@ -6,20 +6,24 @@ namespace Mr.BrickAdventures.Tools.CaLevelGenerator;
 [Tool]
 public partial class CaLevelGeneratorPlugin : EditorPlugin
 {
+    private EditorDock _editorDock;
     private CaLevelGeneratorDock _dock;
 
     public override void _EnterTree()
     {
         _dock = new CaLevelGeneratorDock { Plugin = this };
-        AddControlToDock(DockSlot.RightUl, _dock);
+        _editorDock = new EditorDock { Title = "CA Level Generator" };
+        _editorDock.AddChild(_dock);
+        AddDock(_editorDock);
         SceneChanged += OnSceneChanged;
     }
 
     public override void _ExitTree()
     {
         SceneChanged -= OnSceneChanged;
-        RemoveControlFromDocks(_dock);
-        _dock.QueueFree();
+        RemoveDock(_editorDock);
+        _editorDock.QueueFree();
+        _editorDock = null;
         _dock = null;
     }