diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml
index 64df60b132..8a51f2baff 100644
--- a/resources/qml/Settings/SettingTextField.qml
+++ b/resources/qml/Settings/SettingTextField.qml
@@ -108,6 +108,7 @@ SettingItem
                 left: parent.left
                 leftMargin: UM.Theme.getSize("setting_unit_margin").width
                 right: parent.right
+                rightMargin: UM.Theme.getSize("setting_unit_margin").width
                 verticalCenter: parent.verticalCenter
             }
             renderType: Text.NativeRendering
@@ -155,6 +156,7 @@ SettingItem
             selectByMouse: true;
 
             maximumLength: (definition.type == "str" || definition.type == "[int]") ? -1 : 10;
+            clip: true; //Hide any text that exceeds the width of the text box.
 
             validator: RegExpValidator { regExp: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,9}\s*,)*(\s*-?[0-9]{0,9})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,10}$/ : (definition.type == "float") ? /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ : /^.*$/ } // definition.type property from parent loader used to disallow fractional number entry