diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index db6c75f280..da986cf0bf 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -246,7 +246,7 @@ Item
             }
             PropertyChanges {
                 target: panelBorder
-                anchors.bottomMargin: -(base.activeY + UM.Theme.getSize("button").height)
+                anchors.bottomMargin: ((base.activeY + UM.Theme.getSize("button").height) > panelBorder.height) ? -(base.activeY + UM.Theme.getSize("button").height) : -panelBorder.height
             }
         }
     ]