diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
index c712c554bf3e19dbec1b65e718e4ced2200b1adf..2dc4eaceb2e9398cde008ee9dfdd61d3dec796c0 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
@@ -27,13 +27,18 @@ GroupBox {
             visible: showIsWrapping
             layout: HorizontalLayout {
                 Label {
-                    text: ""
+                    text: "Wrap Mode"
                 }
-                CheckBox {
-                    baseStateFlag: isBaseState;
-                    text: qsTr("Is Wrapping")
-                    checkable: true;
-                    backendValue: backendValues.wrap;
+                ComboBox {
+                    baseStateFlag: isBaseState
+                    minimumHeight: 22;
+                    items : { ["NoWrap", "WordWrap", "WrapAnywhere", "WrapAtWordBoundaryOrAnywhere"] }
+                    currentText: backendValues.wrapMode.value;
+                    onItemsChanged: {
+                        currentText =  backendValues.wrapMode.value;
+                    }
+
+                    backendValue: backendValues.wrapMode
                 }
             }
         }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
index c9e9a62fd532d5909994158c591d31355890b892..6a0dc35f3bf2d80be67f608dc4a66b5f9fbd78a8 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
@@ -13,6 +13,7 @@ QWidget {
 
         StandardTextGroupBox {
             finished: finishedNotify;
+            showIsWrapping: true
         }
         StandardTextColorGroupBox {
             finished: finishedNotify;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
index 7d0b7577254822e28b11c9ff55e2e7edeb463a21..9dda196f5efd21d51b3d51ae8073b3be64c6bdda 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
@@ -5,8 +5,22 @@ GroupBox {
 
     id: textInputGroupBox
     caption: qsTr("Text Input")
+    property bool isTextInput: false
 
-    layout: VerticalLayout {       
+    layout: VerticalLayout {
+
+        QWidget {
+            visible: isTextInput
+            layout: HorizontalLayout {
+
+                Label {text: "Input Mask"}
+
+                LineEdit {
+                    backendValue: backendValues.inputMask
+                    baseStateFlag: isBaseState
+                }
+            }
+        }
 
         QWidget {
             layout: HorizontalLayout {
@@ -18,13 +32,10 @@ GroupBox {
                     checkable: true;
                     backendValue: backendValues.readOnly;
                 }
-
-
-
-                
             }
         }
 
+
         QWidget {
             layout: HorizontalLayout {
                 Label {text: ""}
@@ -48,7 +59,20 @@ GroupBox {
                     text: qsTr("Focus On Press")
                     baseStateFlag: isBaseState;
                     checkable: true;
-                    backendValue:  backendValues. focusOnPress;
+                    backendValue:  backendValues.focusOnPress;
+                }
+            }
+        }
+
+        QWidget {
+            visible: isTextInput
+            layout: HorizontalLayout {
+                Label {text: ""}
+                CheckBox {
+                    text: qsTr("Auto Scroll")
+                    baseStateFlag: isBaseState;
+                    checkable: true;
+                    backendValue:  backendValues.autoScroll;
                 }
             }
         }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
index 4ed4b74f58586a31627c8e5ad140ddb02b8a1eca..3a98fe9a61c0a21db3e4f3b6f1624f050d78ff4a 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
@@ -17,8 +17,8 @@ QWidget {
 
         StandardTextColorGroupBox {
             finished: finishedNotify;
-			showSelectionColor: true;
-			showSelectedTextColor: true;
+            showSelectionColor: true;
+            showSelectedTextColor: true;
         }
 
         FontGroupBox {
@@ -27,7 +27,8 @@ QWidget {
         }
 
         TextInputGroupBox {
-            finished: finishedNotify;
+            finished: finishedNotify
+            isTextInput: true
         }
         QScrollArea {
         }