diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml
index 18255939ab..eb949a84ec 100644
--- a/resources/qml/ExpandablePopup.qml
+++ b/resources/qml/ExpandablePopup.qml
@@ -35,7 +35,8 @@ Item
     property color headerActiveColor: UM.Theme.getColor("secondary")
     property color headerHoverColor: UM.Theme.getColor("action_button_hovered")
 
-    property alias enabled: mouseArea.enabled
+    property alias mouseArea: headerMouseArea
+    property alias enabled: headerMouseArea.enabled
 
     // Text to show when this component is disabled
     property alias disabledText: disabledLabel.text
@@ -139,6 +140,16 @@ Item
             anchors.fill: parent
             visible: base.enabled
 
+            MouseArea
+            {
+                id: headerMouseArea
+                anchors.fill: parent
+                onClicked: toggleContent()
+                hoverEnabled: true
+                onEntered: background.color = headerHoverColor
+                onExited: background.color = base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled")
+            }
+
             Loader
             {
                 id: headerItemLoader
@@ -180,15 +191,6 @@ Item
             }
         }
 
-        MouseArea
-        {
-            id: mouseArea
-            anchors.fill: parent
-            onClicked: toggleContent()
-            hoverEnabled: true
-            onEntered: background.color = headerHoverColor
-            onExited: background.color = base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled")
-        }
     }
 
     DropShadow
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 4cbae378f9..1530a9b215 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -60,6 +60,7 @@ Cura.ExpandablePopup
 
         UM.RecolorImage
         {
+            id: connectionStatusImage
             anchors
             {
                 bottom: parent.bottom
@@ -106,6 +107,27 @@ Cura.ExpandablePopup
                 color: UM.Theme.getColor("main_background")
                 z: parent.z - 1
             }
+
+            MouseArea // Connection status tooltip hover area
+                {
+                    id: connectionStatusTooltipHoverArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    enabled: true // todo
+                    acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks
+
+                    onEntered:
+                    {
+                        base.showTooltip(
+                            connectionStatusImage,
+                            Qt.point(0, 0),
+                            "blaat blaat"
+                        ); //todo
+                        machineSelector.mouseArea.entered() // we want both this and the outer area to be entered
+                    }
+                    onExited: base.hideTooltip()
+                }
+
         }
     }