Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -re7c552d59935eb2a63f3dcee0a5161d19f5c7ac5 -r5c4bcd852bc3026166a409e3fae4a08dbbe98bd0
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision e7c552d59935eb2a63f3dcee0a5161d19f5c7ac5)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 5c4bcd852bc3026166a409e3fae4a08dbbe98bd0)
@@ -94,6 +94,7 @@
         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
@@ -154,10 +155,7 @@
             readonly property string postSecurityTypeLabel      : wifiSupported ? "" : " - " + qsTr("Not Supported")
             readonly property bool   isConnected                : wifiConnected
             onIsConnectedChanged: {
-                if ( isConnected ) {
-                    _ssidText.text = wifiSsid
-                    
-                }
+                _ssidText.text = isConnected ? wifiSsid : ""
             }
 
             clip            : true