diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
index f9193e724d..68ee482b5c 100644
--- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
@@ -208,8 +208,8 @@ Item
 
             Label
             {
-                width: parent.width
-                wrapMode: Text.WordWrap
+                width: parent.width - (2 * UM.Theme.getSize("default_margin").width)
+                wrapMode: Text.Wrap
                 text: base.getMachineName()
                 color: UM.Theme.getColor("primary_button")
                 font: UM.Theme.getFont("huge")
@@ -273,6 +273,7 @@ Item
                     id: printerNameTextField
                     placeholderText: catalog.i18nc("@text", "Please name your printer")
                     maximumLength: 40
+                    width: parent.width - (printerNameLabel.width + (3 * UM.Theme.getSize("default_margin").width))
                     validator: RegExpValidator
                     {
                         regExp: printerNameTextField.machineNameValidator.machineNameRegex