diff --git a/modules/panel/components/globalmenu.py b/modules/panel/components/globalmenu.py
index 6dc03aa..d124b5b 100644
--- a/modules/panel/components/globalmenu.py
+++ b/modules/panel/components/globalmenu.py
@@ -34,9 +34,7 @@ def create_menu_button(label, on_clicked=None):
     return button
 
 
-def create_dropdown_with_capture(
-    dropdown_id, parent, dropdown_children, layer="bottom"
-):
+def create_dropdown_with_capture(dropdown_id, parent, dropdown_children, layer="top"):
     dropdown = ModusDropdown(
         dropdown_id=dropdown_id,
         parent=parent,
@@ -140,7 +138,7 @@ class GlobalMenuDropdowns:
 
         self.system_dropdown = SystemDropdown(parent=parent)
         self.menu_button_dropdown = DropDownMouseCapture(
-            layer="bottom", child_window=self.system_dropdown
+            layer="top", child_window=self.system_dropdown
         )
         self.menu_button = Button(
             label="Modus",
diff --git a/modules/panel/components/indicators.py b/modules/panel/components/indicators.py
index d22d393..c8aa407 100644
--- a/modules/panel/components/indicators.py
+++ b/modules/panel/components/indicators.py
@@ -85,6 +85,8 @@ class BluetoothIndicator(Box):
             self,
             show_back_button=False,
         )
+        if self.bluetooth_window:
+            self.bluetooth_window._pointing_widget = self.bt_button
 
         modus_service.connect("bluetooth-changed", self.on_bluetooth_changed)
         self.bluetooth.connect("changed", self.on_bluetooth_direct_changed)
@@ -194,6 +196,8 @@ class NetworkIndicator(Box):
             self,
             show_back_button=False,
         )
+        if self.wifi_window:
+            self.wifi_window._pointing_widget = self.network_button
 
         modus_service.connect("wlan-changed", self.on_wlan_changed)
         self.network_service.connect("wifi-device-added", self.on_wifi_device_added)
@@ -348,6 +352,8 @@ class BatteryIndicator(Box):
             self,
             show_back_button=False,
         )
+        if self.battery_window:
+            self.battery_window._pointing_widget = self.battery_button
 
         modus_service.connect("battery-changed", self.on_battery_changed)
         self.battery_service.connect("changed", self.on_battery_direct_changed)