diff --git a/main.py b/main.py
index 18fa715..e2aa080 100644
--- a/main.py
+++ b/main.py
@@ -30,7 +30,22 @@ class Verfahrensgebiet:
             self.dockwidget.deleteLater()
             self.dockwidget = None
 
+        # Action zurücksetzen, falls vorhanden
+        if self.action:
+            basis = plugins.get("sn_basis")
+            if basis and basis.ui:
+                basis.ui.set_active_plugin(None)
+
     def run(self):
         self.dockwidget = DockWidget(self.iface.mainWindow(), subtitle=self.plugin_name)
         self.dockwidget.setObjectName(self.dock_name)
+
+        # Action-Referenz im Dock speichern
+        self.dockwidget.action = self.action
+
         DockManager.show(self.dockwidget)
+
+        # Toolbar-Button als aktiv markieren
+        basis = plugins.get("sn_basis")
+        if basis and basis.ui:
+            basis.ui.set_active_plugin(self.action)