diff --git a/bec_widgets/cli/client_utils.py b/bec_widgets/cli/client_utils.py
index 8fc70294..d4962dfd 100644
--- a/bec_widgets/cli/client_utils.py
+++ b/bec_widgets/cli/client_utils.py
@@ -20,7 +20,6 @@ from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 import bec_widgets.cli.client as client
 from bec_widgets.cli.auto_updates import AutoUpdates
 from bec_widgets.cli.rpc.rpc_base import RPCBase
-from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
 
 if TYPE_CHECKING:
     from bec_lib import messages
@@ -185,6 +184,7 @@ class BECGuiClient(RPCBase):
         self._process_output_processing_thread = None
         self._exposed_dock_areas = []
         self._registry_state = {}
+        self.available_widgets = client.Widgets
 
     def connect_to_gui_server(self, gui_id: str) -> None:
         """Connect to a GUI server"""
diff --git a/bec_widgets/widgets/containers/dock/dock_area.py b/bec_widgets/widgets/containers/dock/dock_area.py
index f92ec5da..402cdeea 100644
--- a/bec_widgets/widgets/containers/dock/dock_area.py
+++ b/bec_widgets/widgets/containers/dock/dock_area.py
@@ -217,7 +217,7 @@ class BECDockArea(BECWidget, QWidget):
     @SafeSlot()
     def _create_widget_from_toolbar(self, widget_name: str) -> None:
         dock_name = WidgetContainerUtils.generate_unique_name(widget_name, self.panels.keys())
-        dock: BECDock = self.new(name=dock_name, widget=widget_name)
+        self.new(name=dock_name, widget=widget_name)
 
     def paintEvent(self, event: QPaintEvent):  # TODO decide if we want any default instructions
         super().paintEvent(event)