diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
index eb6c49281c..8b8606be73 100644
--- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
@@ -87,7 +87,7 @@ Item
         {
             id: scrollView
 
-            height: (maxItemCountAtOnce * UM.Theme.getSize("action_button").height) - UM.Theme.getSize("default_margin").height
+            height: childrenHeight
             width: Math.floor(parent.width * 0.4)
 
             ListView
@@ -197,7 +197,7 @@ Item
         {
             id: verticalLine
             anchors.top: parent.top
-            anchors.bottom: parent.bottom
+            height: childrenHeight - UM.Theme.getSize("default_lining").height
             width: UM.Theme.getSize("default_lining").height
             color: UM.Theme.getColor("lining")
         }
diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
index b6f715aa0b..6ac567b0b1 100644
--- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
+++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
@@ -108,6 +108,12 @@ Item
             AddLocalPrinterScrollView
             {
                 id: localPrinterView
+                property int childrenHeight: backButton.y - addLocalPrinterDropDown.y - UM.Theme.getSize("expandable_component_content_header").height - UM.Theme.getSize("default_margin").height
+
+                onChildrenHeightChanged:
+                {
+                    addLocalPrinterDropDown.children[1].height = childrenHeight
+                }
             }
         }
     }
diff --git a/resources/qml/Widgets/ScrollView.qml b/resources/qml/Widgets/ScrollView.qml
index 43a80204f7..9e7531994c 100644
--- a/resources/qml/Widgets/ScrollView.qml
+++ b/resources/qml/Widgets/ScrollView.qml
@@ -9,6 +9,7 @@ import UM 1.1 as UM
 ScrollView
 {
     clip: true
+
     // Setting this property to false hides the scrollbar both when the scrollbar is not needed (child height < height)
     // and when the scrollbar is not actively being hovered or pressed
     property bool scrollAlwaysVisible: true