diff --git a/src/extension.ts b/src/extension.ts
index 0ddf635..1a12cfe 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -118,7 +118,7 @@ export default class WifiSignalPlusExtension extends Extension {
     private nearbySection: PopupMenu.PopupMenuSection | null = null;
     private nearbyItems: NearbyNetworkCard[] = [];
     private nearbyUpdatePending = false;
-    private currentConnectedBssid: string | undefined;
+    private currentConnectedSsid: string | undefined;
     private isMenuOpen = false;
     private enableEpoch = 0;
 
@@ -169,7 +169,7 @@ export default class WifiSignalPlusExtension extends Extension {
         this.nearbyItems = [];
         this.refreshPending = false;
         this.nearbyUpdatePending = false;
-        this.currentConnectedBssid = undefined;
+        this.currentConnectedSsid = undefined;
         this.isMenuOpen = false;
     }
 
@@ -453,7 +453,7 @@ export default class WifiSignalPlusExtension extends Extension {
             const info = await this.wifiService.getConnectionInfo();
             if (!this.wifiService) return;
 
-            this.currentConnectedBssid = isConnected(info) ? info.bssid : undefined;
+            this.currentConnectedSsid = isConnected(info) ? info.ssid : undefined;
             this.updateIndicatorLabel(info);
             this.updateMenuContent(info);
 
@@ -619,7 +619,7 @@ export default class WifiSignalPlusExtension extends Extension {
         this.nearbyUpdatePending = true;
         let grouped: Map<string, ScannedNetwork[]>;
         try {
-            grouped = await this.wifiService.getAvailableNetworks(this.currentConnectedBssid);
+            grouped = await this.wifiService.getAvailableNetworks(this.currentConnectedSsid);
         } finally {
             this.nearbyUpdatePending = false;
         }
diff --git a/src/wifiInfo.ts b/src/wifiInfo.ts
index 893e13f..483bca8 100644
--- a/src/wifiInfo.ts
+++ b/src/wifiInfo.ts
@@ -139,7 +139,7 @@ export class WifiInfoService {
         });
     }
 
-    async getAvailableNetworks(excludeBssid?: string): Promise<Map<string, ScannedNetwork[]>> {
+    async getAvailableNetworks(excludeSsid?: string): Promise<Map<string, ScannedNetwork[]>> {
         if (!this.client) return new Map();
 
         const wifiDevice = this.findWifiDevice();
@@ -155,10 +155,10 @@ export class WifiInfoService {
 
             const ssid = this.decodeSsid(ap.get_ssid());
             if (!ssid) continue;
+            if (excludeSsid && ssid === excludeSsid) continue;
 
             const bssid = (ap.get_bssid() ?? '').toLowerCase();
             if (!bssid) continue;
-            if (excludeBssid && bssid === excludeBssid.toLowerCase()) continue;
 
             const frequency = asFrequencyMHz(ap.get_frequency());
             const generation = this.generationMap.get(bssid) ?? WIFI_GENERATIONS.UNKNOWN;