diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index acd067c7d4faf503da28bf05c70411d7e7053365..82d2406245a4e8f57ffb2b9e2c4f84b716c9fe99 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -569,18 +569,21 @@ Rectangle {
             font.pixelSize:         tbFontLarge
             font.weight:            Font.DemiBold
             color:                  colorRed
-            anchors.left:           parent.left
+            anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
+            anchors.right:          disconnectButton.left
             anchors.verticalCenter: parent.verticalCenter
             visible:                parent.vehicleConnectionLost
 
         }
 
         QGCButton {
+            id:                     disconnectButton
             anchors.rightMargin:     mainWindow.tbSpacing * 2
             anchors.right:          parent.right
             anchors.verticalCenter: parent.verticalCenter
             text:                   "Disconnect"
             visible:                parent.vehicleConnectionLost
+            primary:                true
             onClicked:              activeVehicle.disconnectInactiveVehicle()
         }
     }