diff --git a/Modules/Panels/Network/NetworkPanel.qml b/Modules/Panels/Network/NetworkPanel.qml
index bbf7ef77d..c0718d380 100644
--- a/Modules/Panels/Network/NetworkPanel.qml
+++ b/Modules/Panels/Network/NetworkPanel.qml
@@ -36,6 +36,7 @@ SmartPanel {
       ethernetInfoExpanded = false;
       if (NetworkService.wifiEnabled && !NetworkService.scanningActive) {
         NetworkService.scan();
+        NetworkService.refreshActiveWifiDetails();
       }
     } else {
       if (NetworkService.ethernetConnected) {
@@ -50,11 +51,13 @@ SmartPanel {
   onEffectivelyVisibleChanged: {
     if (effectivelyVisible) {
       SystemStatService.registerComponent("network-panel");
-      NetworkService.scan();
-      // Preload active Wi‑Fi details so Info shows instantly
-      NetworkService.refreshActiveWifiDetails();
-      // Also fetch Ethernet details if connected
-      NetworkService.refreshActiveEthernetDetails();
+      if (NetworkService.wifiEnabled && !NetworkService.scanningActive) {
+        NetworkService.scan();
+        NetworkService.refreshActiveWifiDetails();
+      }
+      if (NetworkService.ethernetConnected) {
+        NetworkService.refreshActiveEthernetDetails();
+      }
     } else {
       SystemStatService.unregisterComponent("network-panel");
     }
@@ -178,14 +181,12 @@ SmartPanel {
               text: I18n.tr("common.wifi")
               tabIndex: 0
               checked: modeTabBar.currentIndex === 0
-              enabled: NetworkService.wifiAvailable
             }
 
             NTabButton {
               text: I18n.tr("common.ethernet")
               tabIndex: 1
               checked: modeTabBar.currentIndex === 1
-              enabled: NetworkService.ethernetAvailable
             }
           }
         }
diff --git a/Modules/Panels/Settings/Tabs/Connections/WifiSubTab.qml b/Modules/Panels/Settings/Tabs/Connections/WifiSubTab.qml
index 5fdc3fd05..918d5dd5d 100644
--- a/Modules/Panels/Settings/Tabs/Connections/WifiSubTab.qml
+++ b/Modules/Panels/Settings/Tabs/Connections/WifiSubTab.qml
@@ -75,26 +75,17 @@ Item {
   onEffectivelyVisibleChanged: {
     if (effectivelyVisible) {
       SystemStatService.registerComponent("wifi-subtab");
-      if (NetworkService.wifiEnabled && !NetworkService.scanningActive) {
+      if (NetworkService.wifiEnabled && !NetworkService.scanningActive && !showOnlyLists) {
         NetworkService.scan();
+        NetworkService.refreshActiveWifiDetails();
       }
     } else {
       SystemStatService.unregisterComponent("wifi-subtab");
-      NetworkService.scanningActive = false;
-    }
-  }
-
-  Component.onCompleted: {
-    if (effectivelyVisible) {
-      SystemStatService.registerComponent("wifi-subtab");
     }
   }
 
   Component.onDestruction: {
     SystemStatService.unregisterComponent("wifi-subtab");
-    if (effectivelyVisible) {
-      NetworkService.scanningActive = false;
-    }
   }
 
   // Actions