Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r3441b0d1b1cb14d02315638eab74ce7dafb96482 -rbf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 3441b0d1b1cb14d02315638eab74ce7dafb96482)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision bf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634)
@@ -94,7 +94,6 @@
         TextEntry { id      : _dns
             textInput.text  : vDevice.dns
             textInput.width : entryWidth
-            textInput.wrapMode :  Text.WordWrap
             label.width     : labelWidth
             label.text      : qsTr("DNS")
             hasCursor       : false // set false for now to disable the static IP entry for phase 1
@@ -155,7 +154,10 @@
             readonly property string postSecurityTypeLabel      : wifiSupported ? "" : " - " + qsTr("Not Supported")
             readonly property bool   isConnected                : wifiConnected
             onIsConnectedChanged: {
-                _ssidText.text = isConnected ? wifiSsid : ""
+                if ( isConnected ) {
+                    _ssidText.text = wifiSsid
+                    
+                }
             }
 
             clip            : true