diff --git a/Modules/Bar/Widgets/WiFi.qml b/Modules/Bar/Widgets/WiFi.qml
index efa80d8d..abfbdcdf 100644
--- a/Modules/Bar/Widgets/WiFi.qml
+++ b/Modules/Bar/Widgets/WiFi.qml
@@ -60,21 +60,22 @@ Item {
     text: {
       try {
         if (NetworkService.ethernetConnected) {
-          return "ethernet"
+          return ""
         }
         for (const net in NetworkService.networks) {
           if (NetworkService.networks[net].connected) {
             return net
           }
         }
+        return ""
       } catch (error) {
         Logger.e("Wi-Fi", "Error getting ssid:", error)
+        return "error"
       }
-      return "unknown"
     }
     autoHide: false
     forceOpen: root.displayMode === "alwaysShow"
-    forceClose: root.displayMode === "alwaysHide"
+    forceClose: root.displayMode === "alwaysHide" || !pill.text
     disableOpen: NetworkService.ethernetConnected
     onClicked: PanelService.getPanel("wifiPanel")?.toggle(this)
     onRightClicked: PanelService.getPanel("wifiPanel")?.toggle(this)