diff --git a/Modules/Bar/ActiveWindow.qml b/Modules/Bar/ActiveWindow.qml
index 4e5aafd..7fd9cfb 100644
--- a/Modules/Bar/ActiveWindow.qml
+++ b/Modules/Bar/ActiveWindow.qml
@@ -5,7 +5,6 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 
-
 Row {
   id: layout
   anchors.verticalCenter: parent.verticalCenter
diff --git a/Modules/Bar/WiFi.qml b/Modules/Bar/WiFi.qml
index ee4bb9d..cd8a620 100644
--- a/Modules/Bar/WiFi.qml
+++ b/Modules/Bar/WiFi.qml
@@ -19,7 +19,7 @@ NIconButton {
     for (const net in NetworkService.networks) {
       if (NetworkService.networks[net].connected) {
         connected = true
-        signalStrength = network.networks[net].signal
+        signalStrength = NetworkService.networks[net].signal
         break
       }
     }
diff --git a/Modules/Bar/WiFiMenu.qml b/Modules/Bar/WiFiMenu.qml
index e0c37df..c292c55 100644
--- a/Modules/Bar/WiFiMenu.qml
+++ b/Modules/Bar/WiFiMenu.qml
@@ -62,7 +62,7 @@ NLoader {
         onTriggered: {
           wifiPanel.visible = false
           wifiPanel.dismissed()
-          NetworkService.onMenuClosed()
+          // NetworkService.onMenuClosed()
         }
       }
 
@@ -163,7 +163,7 @@ NLoader {
               icon: "refresh"
               tooltipText: "Refresh Networks"
               sizeMultiplier: 0.8
-              enabled: Settings.data.network.wifiEnabled && !network.isLoading
+              enabled: Settings.data.network.wifiEnabled && !NetworkService.isLoading
               onClicked: {
                 NetworkService.refreshNetworks()
               }
@@ -239,8 +239,8 @@ NLoader {
             ListView {
               id: networkList
               anchors.fill: parent
-              visible: Settings.data.network.wifiEnabled && !network.isLoading
-              model: Object.values(network.networks)
+              visible: Settings.data.network.wifiEnabled && !NetworkService.isLoading
+              model: Object.values(NetworkService.networks)
               spacing: Style.marginMedium * scaling
               clip: true
 
@@ -295,7 +295,7 @@ NLoader {
 
                         NText {
                           visible: NetworkService.connectStatusSsid === modelData.ssid
-                                   && NetworkService.connectStatus === "error" && network.connectError.length > 0
+                                   && NetworkService.connectStatus === "error" && NetworkService.connectError.length > 0
                           text: NetworkService.connectError
                           color: Colors.mError
                           font.pointSize: Style.fontSizeSmall * scaling
@@ -308,7 +308,8 @@ NLoader {
                         Layout.preferredWidth: Style.baseWidgetSize * 0.7 * scaling
                         Layout.preferredHeight: Style.baseWidgetSize * 0.7 * scaling
                         visible: NetworkService.connectStatusSsid === modelData.ssid
-                                 && (network.connectStatus !== "" || NetworkService.connectingSsid === modelData.ssid)
+                                 && (NetworkService.connectStatus !== ""
+                                     || NetworkService.connectingSsid === modelData.ssid)
 
                         NBusyIndicator {
                           visible: NetworkService.connectingSsid === modelData.ssid
diff --git a/Services/NetworkService.qml b/Services/NetworkService.qml
index 0ffa766..07e5847 100644
--- a/Services/NetworkService.qml
+++ b/Services/NetworkService.qml
@@ -1,6 +1,9 @@
+pragma Singleton
+
 import QtQuick
 import Quickshell
 import Quickshell.Io
+import qs.Commons
 
 Singleton {
   id: root
@@ -14,6 +17,14 @@ Singleton {
   property string lastConnectedNetwork: ""
   property bool isLoading: false
 
+  Component.onCompleted: {
+    console.log("[Network] Service started")
+    // Only refresh networks if WiFi is enabled
+    if (Settings.data.network.wifiEnabled) {
+      refreshNetworks()
+    }
+  }
+
   function signalIcon(signal) {
     if (signal >= 80)
       return "network_wifi"
@@ -252,7 +263,7 @@ Singleton {
         for (var i = 0; i < lines.length; ++i) {
           const line = lines[i].trim()
           if (!line)
-            continue
+          continue
 
           const parts = line.split(":")
           if (parts.length < 2) {
@@ -291,7 +302,7 @@ Singleton {
         for (var i = 0; i < lines.length; ++i) {
           const line = lines[i].trim()
           if (!line)
-            continue
+          continue
 
           const parts = line.split(":")
           if (parts.length < 4) {
@@ -456,11 +467,4 @@ Singleton {
       }
     }
   }
-
-  Component.onCompleted: {
-    // Only refresh networks if WiFi is enabled
-    if (Settings.data.network.wifiEnabled) {
-      refreshNetworks()
-    }
-  }
 }