Index: sources/gui/qml/BluetoothStatusIndicator.qml
===================================================================
diff -u -r1311b2947c5a8afed475e99847f99e91ca064d14 -r070977fbf934ea7ff458bdadc6c1e0b7e7efd3bf
--- sources/gui/qml/BluetoothStatusIndicator.qml	(.../BluetoothStatusIndicator.qml)	(revision 1311b2947c5a8afed475e99847f99e91ca064d14)
+++ sources/gui/qml/BluetoothStatusIndicator.qml	(.../BluetoothStatusIndicator.qml)	(revision 070977fbf934ea7ff458bdadc6c1e0b7e7efd3bf)
@@ -75,12 +75,13 @@
         font.bold: true
     }
 
-    onClicked: _btInfoDialog.open()
+    onClicked: if(displayInformation) _btInfoDialog.open()
 
     Item {
         // To allow better positioning control, wrapping ModalDialog in Item
         anchors.right : _btStatusRoot.right
         anchors.top   : _btStatusRoot.bottom
+
         width : _btInfoDialog.width
         height: _btInfoDialog.height
 
Index: sources/gui/qml/dialogs/StatusDialog.qml
===================================================================
diff -u -rd1a4fe257de0cc4fe51f241075f429d22d83eebe -r070977fbf934ea7ff458bdadc6c1e0b7e7efd3bf
--- sources/gui/qml/dialogs/StatusDialog.qml	(.../StatusDialog.qml)	(revision d1a4fe257de0cc4fe51f241075f429d22d83eebe)
+++ sources/gui/qml/dialogs/StatusDialog.qml	(.../StatusDialog.qml)	(revision 070977fbf934ea7ff458bdadc6c1e0b7e7efd3bf)
@@ -40,7 +40,7 @@
         x: 0
         y: 0
         anchors.fill: parent
-        anchors.margins: 5
+        anchors.margins: 10
 
         Text { id: _dialogTitle
             width: _root.width - _closeButton.width
@@ -52,6 +52,9 @@
         }
 
         Repeater { id: _infoRepeater
+            // When the model changes, the dialog height is updated to accomodate rows of data
+            onModelChanged: _root.height = (statusInfo.length + infoLabels.length) * 30
+
             model: []
             Column {
                 width: _root.width - _closeButton.width