diff --git a/src/QmlControls/QGCPopupDialogContainer.qml b/src/QmlControls/QGCPopupDialogContainer.qml
index c9441d85fc5ce07927aa181e9d5c6e8cffd92f4f..754973efee0804825117f62614f317c5dbb2a82d 100644
--- a/src/QmlControls/QGCPopupDialogContainer.qml
+++ b/src/QmlControls/QGCPopupDialogContainer.qml
@@ -18,15 +18,60 @@ import QGroundControl.Palette       1.0
 import QGroundControl.ScreenTools   1.0
 
 Popup {
+    id:                 root
     anchors.centerIn:   parent
-    width:              mainFlickable.width
-    height:             mainFlickable.height
-    padding:            0
+    width:              mainFlickable.width + (padding * 2)
+    height:             mainFlickable.height + (padding * 2)
+    padding:            2
     modal:              true
     focus:              true
 
-    background: Rectangle {
-        color: QGroundControl.globalPalette.window
+    property var pal:           QGroundControl.globalPalette
+    property real frameSize:    ScreenTools.defaultFontPixelWidth
+
+    background: Item {
+
+        Rectangle {
+            anchors.left:   parent.left
+            anchors.top:    parent.top
+            width:          frameSize
+            height:         frameSize
+            color:          pal.text
+            visible:        enabled
+        }
+
+        Rectangle {
+            anchors.right:  parent.right
+            anchors.top:    parent.top
+            width:          frameSize
+            height:         frameSize
+            color:          pal.text
+            visible:        enabled
+        }
+
+        Rectangle {
+            anchors.left:   parent.left
+            anchors.bottom: parent.bottom
+            width:          frameSize
+            height:         frameSize
+            color:          pal.text
+            visible:        enabled
+        }
+
+        Rectangle {
+            anchors.right:  parent.right
+            anchors.bottom: parent.bottom
+            width:          frameSize
+            height:         frameSize
+            color:          pal.text
+            visible:        enabled
+        }
+
+        Rectangle {
+            anchors.margins:    root.padding
+            anchors.fill:       parent
+            color:              pal.window
+        }
     }
 
     property string title