diff --git a/resources/qml/PrintSetupTooltip.qml b/resources/qml/PrintSetupTooltip.qml
index 29fe7d6508..5e5b1dce73 100644
--- a/resources/qml/PrintSetupTooltip.qml
+++ b/resources/qml/PrintSetupTooltip.qml
@@ -11,7 +11,7 @@ UM.PointingRectangle
     id: base
     property real sourceWidth: 0
     width: UM.Theme.getSize("tooltip").width
-    height: textScroll.height + UM.Theme.getSize("tooltip_margins").height * 2
+    height: UM.Theme.getSize("tooltip").height
     color: UM.Theme.getColor("tooltip")
 
     arrowSize: UM.Theme.getSize("default_arrow").width
@@ -81,12 +81,11 @@ UM.PointingRectangle
         ScrollView
         {
             id: textScroll
-            width: parent.width
-            height: Math.min(label.height, base.parent.height)
+            width: base.width
+            height: base.height
 
-            ScrollBar.horizontal: ScrollBar {
-                active: false //Only allow vertical scrolling. We should grow vertically only, but due to how the label is positioned it allocates space in the ScrollView horizontally.
-            }
+            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+            ScrollBar.vertical.policy: ScrollBar.AsNeeded
 
             UM.Label
             {