diff --git a/tailscalectl/TailscaleWidget.qml b/tailscalectl/TailscaleWidget.qml
index d182db4..3597e91 100644
--- a/tailscalectl/TailscaleWidget.qml
+++ b/tailscalectl/TailscaleWidget.qml
@@ -75,24 +75,22 @@ PluginComponent {
 
     popoutContent: Component {
         PopoutComponent {
-            id: popout
             headerText: "Tailscale"
             detailsText: root.isConnected ? "Connected" : "Disconnected"
             showCloseButton: true
 
-            Column {
+            Item {
                 width: parent.width
-                height: parent.height - popout.headerHeight - popout.detailsHeight - Theme.spacingXL
-                anchors.top: parent.top
-                anchors.topMargin: Theme.spacingM
-                spacing: Theme.spacingM
+                height: Theme.spacingM + statusRow.implicitHeight + Theme.spacingS + exitNodeText.implicitHeight + Theme.spacingM
 
                 Row {
+                    id: statusRow
+                    y: Theme.spacingM
                     width: parent.width
                     spacing: Theme.spacingS
                     anchors.left: parent.left
-                    anchors.right: parent.right
                     anchors.leftMargin: Theme.spacingM
+                    anchors.right: parent.right
                     anchors.rightMargin: Theme.spacingM
 
                     MouseArea {
@@ -101,7 +99,9 @@ PluginComponent {
                         anchors.verticalCenter: parent.verticalCenter
                         width: toggleIcon.implicitWidth
                         height: toggleIcon.implicitHeight
-                        onClicked: toggleTailscale()
+                        onClicked: {
+                            root.toggleTailscale()
+                        }
 
                         DankIcon {
                             id: toggleIcon
@@ -136,7 +136,9 @@ PluginComponent {
         anchors.fill: parent
         acceptedButtons: Qt.RightButton
         propagateComposedEvents: true
-        onClicked: toggleTailscale()
+        onClicked: {
+            root.toggleTailscale()
+        }
     }
 
     horizontalBarPill: Component {
@@ -147,7 +149,6 @@ PluginComponent {
                 name: root.isConnected ? "vpn_key" : "vpn_key_off"
                 size: Theme.iconSize
                 color: root.isConnected ? Theme.primary : Theme.surfaceText
-                anchors.verticalCenter: parent.verticalCenter
             }
         }
     }
@@ -160,8 +161,7 @@ PluginComponent {
                 name: root.isConnected ? "vpn_key" : "vpn_key_off"
                 size: Theme.iconSize
                 color: root.isConnected ? Theme.primary : Theme.surfaceText
-                anchors.horizontalCenter: parent.horizontalCenter
             }
         }
     }
-}
+}
\ No newline at end of file