diff --git a/Assets/settings-search-index.json b/Assets/settings-search-index.json
index 58cc6796a..2cf5ed446 100644
--- a/Assets/settings-search-index.json
+++ b/Assets/settings-search-index.json
@@ -669,7 +669,7 @@
     ]
   },
   {
-    "labelKey": "toast.airplane-mode.title",
+    "labelKey": "common.wifi",
     "descriptionKey": null,
     "widget": "NToggle",
     "tab": 16,
@@ -678,14 +678,65 @@
     "subTabLabel": "common.wifi"
   },
   {
-    "labelKey": "common.wifi",
+    "labelKey": "common.connected",
     "descriptionKey": null,
+    "widget": "NLabel",
+    "tab": 16,
+    "tabLabel": "panels.connections.title",
+    "subTab": 0,
+    "subTabLabel": "common.wifi"
+  },
+  {
+    "labelKey": "wifi.panel.known-networks",
+    "descriptionKey": null,
+    "widget": "NLabel",
+    "tab": 16,
+    "tabLabel": "panels.connections.title",
+    "subTab": 0,
+    "subTabLabel": "common.wifi"
+  },
+  {
+    "labelKey": "wifi.panel.available-networks",
+    "descriptionKey": null,
+    "widget": "NLabel",
+    "tab": 16,
+    "tabLabel": "panels.connections.title",
+    "subTab": 0,
+    "subTabLabel": "common.wifi"
+  },
+  {
+    "labelKey": "toast.airplane-mode.title",
+    "descriptionKey": "toast.airplane-mode.description",
     "widget": "NToggle",
     "tab": 16,
     "tabLabel": "panels.connections.title",
     "subTab": 0,
     "subTabLabel": "common.wifi"
   },
+  {
+    "labelKey": "wifi.panel.network-name-ssid",
+    "descriptionKey": null,
+    "widget": "NTextInput",
+    "tab": 16,
+    "tabLabel": "panels.connections.title",
+    "subTab": 0,
+    "subTabLabel": "common.wifi",
+    "visibleWhen": [
+      "false"
+    ]
+  },
+  {
+    "labelKey": "common.password",
+    "descriptionKey": null,
+    "widget": "NTextInput",
+    "tab": 16,
+    "tabLabel": "panels.connections.title",
+    "subTab": 0,
+    "subTabLabel": "common.wifi",
+    "visibleWhen": [
+      "false"
+    ]
+  },
   {
     "labelKey": "common.position",
     "descriptionKey": "panels.control-center.position-description",
diff --git a/Services/Networking/NetworkService.qml b/Services/Networking/NetworkService.qml
index 2f18d5a21..e36f73eee 100644
--- a/Services/Networking/NetworkService.qml
+++ b/Services/Networking/NetworkService.qml
@@ -531,7 +531,7 @@ Singleton {
             }
           }
         }
-        
+
         // Update capabilities
         root._wifiAvailable = wifiAvailable;
         root._ethernetAvailable = ethernetAvailable;
@@ -1448,6 +1448,7 @@ Singleton {
       esac
       nmcli connection up id "$SSID"
     `;
+
       return ["sh", "-c", script, "--", ssid, password, securityKey];
     }
     environment: ({
@@ -1579,6 +1580,7 @@ if [ "$deleted" = "false" ]; then
     echo "No profiles found for SSID: $ssid"
 fi
 `;
+
       return ["sh", "-c", script, "--", ssid];
     }