Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0932b2beee9cc169291cbf69161f902f805237b1
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 0932b2beee9cc169291cbf69161f902f805237b1)
@@ -52,7 +52,7 @@
     confirmEnabled  : isValid
     confirmVisible  : false // since the static setting is done one by one seems confirm is not needed for now.
     firstFocusInput : _ipAddress
-    notificationText: vNetwork.status
+    notificationText: vDevice.status
     onConfirmClicked:  {
         vNetwork.doConfirm(
             _ipAddress  .textInput.text ,
@@ -149,8 +149,8 @@
         text.text           : qsTr("SCAN")
         width               : 350
         isDefault           : true
-        enabled             :!vNetwork.scanInProgress
-        onClicked           : vNetwork.doScan()
+        enabled             : vDevice.wifiListEnabled
+        onClicked           : vDevice.wifiList = ""
     }
 
     ScrollBar { flickable   : _networkList