diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml
index aeedc767860d43ba9adbd80114ab3db5107c8395..eb38400720b8ef8efa55e981291b9eacb3b13606 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml
@@ -89,14 +89,18 @@ QWidget {
                     }
                 } //QWidget
 
-                IntEditor {
-                    backendValue: backendValues.keyNavigationWraps
-                    caption: qsTr("Resize wraps")
-                    toolTip: qsTr("Determines whether the grid wraps key navigation.")
-                    baseStateFlag: isBaseState;
-                    step: 1;
-                    minimumValue: 0;
-                    maximumValue: 1000;
+                QWidget {
+                    layout: HorizontalLayout {
+                        Label {
+                            text: qsTr("Navigation wraps")
+                        }
+                        CheckBox {
+                            backendValue: backendValues.keyNavigationWraps
+                            toolTip: qsTr("Determines whether the grid wraps key navigation.")
+                            baseStateFlag: isBaseState;
+                            checkable: True
+                        }
+                    }
                 }
                 //                Qt namespace enums not supported by the rewriter
                 //                QWidget {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
index 9ad5901e036c2f4337b90ded6a2ee1be8f94e836..59ae5e9c7a5ee4c63fe65413f0c9d15243cf989b 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
@@ -56,14 +56,18 @@ QWidget {
                     minimumValue: 0;
                     maximumValue: 1000;
                 }
-                IntEditor {
-                    backendValue: backendValues.keyNavigationWraps
-                    caption: qsTr("Navigation wraps")
-                    toolTip: qsTr("Determines whether the grid wraps key navigation.")
-                    baseStateFlag: isBaseState;
-                    step: 1;
-                    minimumValue: 0;
-                    maximumValue: 1000;
+                QWidget {
+                    layout: HorizontalLayout {
+                        Label {
+                            text: qsTr("Navigation wraps")
+                        }
+                        CheckBox {
+                            backendValue: backendValues.keyNavigationWraps
+                            toolTip: qsTr("Determines whether the grid wraps key navigation.")
+                            baseStateFlag: isBaseState;
+                            checkable: True
+                        }
+                    }
                 }
                 //                Qt namespace enums not supported by the rewriter
                 //                QWidget {