Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rbcff4a1a40c45dd68860d9e3aec12c602f19f3ac -ra2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision bcff4a1a40c45dd68860d9e3aec12c602f19f3ac)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision a2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf)
@@ -18,11 +18,7 @@
         GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.2) }
     }
 
-    function openDialog ( button, dialog ) {
-        var globalPoint = button.mapToGlobal(button.width , 0); // get coordinate of button
-        dialog.x = globalPoint.x - dialog.width                 // position dialog
-        dialog.open()                                           // open dialog
-    }
+    function positionDialog ( button, dialog ) { return button.mapToItem(null, button.width, 0).x - dialog.width }
 
     Item { id: _dateTimeItem
         width   : Variables.headerBarDateTimeWidth
@@ -131,7 +127,7 @@
             iconImageSource : "qrc:/images/iWifi"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : openDialog(_wifiButton,  _wifiDialog)
+            onPressed       : _wifiDialog.open()
         }
 
         IconButton { id  : _bluetoothButton
@@ -175,5 +171,5 @@
         }
     }
 
-    WiFiDialog      { id: _wifiDialog      }
+    WiFiDialog      { id: _wifiDialog;  x: positionDialog(_wifiButton, _wifiDialog) }
 }
Index: sources/gui/qml/components/HeaderBarPopup.qml
===================================================================
diff -u -r17a71bb26f714be5f8eaa3346313a5796cbc3b3a -ra2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf
--- sources/gui/qml/components/HeaderBarPopup.qml	(.../HeaderBarPopup.qml)	(revision 17a71bb26f714be5f8eaa3346313a5796cbc3b3a)
+++ sources/gui/qml/components/HeaderBarPopup.qml	(.../HeaderBarPopup.qml)	(revision a2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf)
@@ -4,9 +4,12 @@
 import "qrc:/globals"
 import "qrc:/components"
 
-ModalDialog { id: dialog
-    width               : 250
-    height              : 150
+ModalDialog { id: _root
+    implicitWidth       : contentItem.implicitWidth  + padding * 2 // Auto-size to content
+    implicitHeight      : contentItem.implicitHeight + padding * 2
+    width               : implicitWidth
+    height              : implicitHeight
+    padding             : 10
     modal               : false
     closePolicy         : Dialog.CloseOnPressOutside
     y                   : Variables.headerHeight + 5
Index: sources/gui/qml/components/ModalDialog.qml
===================================================================
diff -u -r17a71bb26f714be5f8eaa3346313a5796cbc3b3a -ra2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf
--- sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 17a71bb26f714be5f8eaa3346313a5796cbc3b3a)
+++ sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision a2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf)
@@ -53,7 +53,7 @@
     closePolicy: Dialog.NoAutoClose
     Overlay.modal : Rectangle { id : _borderRect
         anchors.fill        : parent
-        anchors.bottomMargin:  _alarmBar.visible ? Variables.notificationHeight : 0
+        anchors.bottomMargin: _alarmBar.visible ? Variables.notificationHeight : 0
         color               : "#99000000"
 
         Behavior on opacity { NumberAnimation { duration: 300} }
Index: sources/gui/qml/dialogs/headerbar/WiFiDialog.qml
===================================================================
diff -u -r14da7bf5c12ad72f1a9442dd5d9a55ddf1ccc409 -ra2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf
--- sources/gui/qml/dialogs/headerbar/WiFiDialog.qml	(.../WiFiDialog.qml)	(revision 14da7bf5c12ad72f1a9442dd5d9a55ddf1ccc409)
+++ sources/gui/qml/dialogs/headerbar/WiFiDialog.qml	(.../WiFiDialog.qml)	(revision a2f4636c3ecf98ec1e38f812f4602e0d67d4b7bf)
@@ -4,20 +4,12 @@
 import "qrc:/globals"
 
 HeaderBarPopup { id: _root
-    readonly property int pixelSize     : Fonts.fontPixelDialogText
-    readonly property bool isConnected  : vDevice.ssid !== ""
+    readonly property int   pixelSize   : Fonts.fontPixelDialogText
+    readonly property bool  isConnected : vDevice.ssid !== ""
 
-    width   : Math.max( _ssid.contentWidth,
-                       _ipAddress.contentWidth) + Variables.defaultMargin * 2
-
-    height  : isConnected ? _ssid.contentHeight + _ipAddress.contentHeight +  Variables.defaultMargin :
-                            _ipAddress.contentHeight +  Variables.defaultMargin
-
     // TODO: Later add Securty type and signal strength if needed
-    Column { id : _dialogColumn
-        anchors.fill        : parent
-        anchors.leftMargin  : Variables.defaultMargin
-        anchors.topMargin   : 10
+    contentItem: Column { id : _dialogColumn
+        anchors.centerIn    : parent
 
         Text { id: _ssid
             text            : ("%1: %2").arg(qsTr("SSID")).arg(vDevice.ssid)