diff --git a/Modules/Bar/Widgets/Bluetooth.qml b/Modules/Bar/Widgets/Bluetooth.qml
index 90b8dee..35ff4d5 100644
--- a/Modules/Bar/Widgets/Bluetooth.qml
+++ b/Modules/Bar/Widgets/Bluetooth.qml
@@ -32,31 +32,4 @@ NIconButton {
   onClicked: {
     bluetoothPanel.toggle(screen)
   }
-
-  Loader {
-    id: bluetoothPanel
-    source: "BluetoothPanel.qml"
-    active: false
-    
-    property var pendingToggleScreen: null
-    
-    onStatusChanged: {
-      if (status === Loader.Ready && item && pendingToggleScreen !== null) {
-        item.toggle(pendingToggleScreen)
-        pendingToggleScreen = null
-      }
-    }
-    
-    function toggle(screen) {
-      // Load the panel if it's not already loaded
-      if (!active) {
-        active = true
-        pendingToggleScreen = screen
-      } else if (status === Loader.Ready && item) {
-        item.toggle(screen)
-      } else {
-        pendingToggleScreen = screen
-      }
-    }
-  }
 }
diff --git a/Modules/Bar/Widgets/WiFi.qml b/Modules/Bar/Widgets/WiFi.qml
index 61a6a13..83b4689 100644
--- a/Modules/Bar/Widgets/WiFi.qml
+++ b/Modules/Bar/Widgets/WiFi.qml
@@ -7,7 +7,6 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 
-
 NIconButton {
   id: root
 
@@ -52,31 +51,4 @@ NIconButton {
       Logger.error("WiFi", "Error toggling panel:", error)
     }
   }
-
-  Loader {
-    id: wifiPanel
-    source: "WiFiPanel.qml"
-    active: false
-    
-    property var pendingToggleScreen: null
-    
-    onStatusChanged: {
-      if (status === Loader.Ready && item && pendingToggleScreen !== null) {
-        item.toggle(pendingToggleScreen)
-        pendingToggleScreen = null
-      }
-    }
-    
-    function toggle(screen) {
-      // Load the panel if it's not already loaded
-      if (!active) {
-        active = true
-        pendingToggleScreen = screen
-      } else if (status === Loader.Ready && item) {
-        item.toggle(screen)
-      } else {
-        pendingToggleScreen = screen
-      }
-    }
-  }
 }
diff --git a/Modules/Bar/Widgets/BluetoothPanel.qml b/Modules/BluetoothPanel/BluetoothPanel.qml
similarity index 100%
rename from Modules/Bar/Widgets/BluetoothPanel.qml
rename to Modules/BluetoothPanel/BluetoothPanel.qml
diff --git a/Modules/Bar/Widgets/WiFiPanel.qml b/Modules/WiFiPanel/WiFiPanel.qml
similarity index 100%
rename from Modules/Bar/Widgets/WiFiPanel.qml
rename to Modules/WiFiPanel/WiFiPanel.qml
diff --git a/shell.qml b/shell.qml
index bd52508..8ce8361 100644
--- a/shell.qml
+++ b/shell.qml
@@ -16,6 +16,7 @@ import qs.Commons
 import qs.Modules.Launcher
 import qs.Modules.Background
 import qs.Modules.Bar
+import qs.Modules.BluetoothPanel
 import qs.Modules.Calendar
 import qs.Modules.Dock
 import qs.Modules.IPC
@@ -25,7 +26,7 @@ import qs.Modules.SettingsPanel
 import qs.Modules.PowerPanel
 import qs.Modules.SidePanel
 import qs.Modules.Toast
-
+import qs.Modules.WiFiPanel
 import qs.Services
 import qs.Widgets
 
@@ -70,6 +71,14 @@ ShellRoot {
     id: powerPanel
   }
 
+  WiFiPanel {
+    id: wifiPanel
+  }
+
+  BluetoothPanel {
+    id: bluetoothPanel
+  }
+
   ToastManager {}
 
   IPCManager {}