diff --git a/examples/quick/controls/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml
index 237604e5d6f05f8d3154c961ae5e0769fe802622..e6a6040fb643f3fa9d17569940883a8a078311b8 100644
--- a/examples/quick/controls/gallery/content/ModelView.qml
+++ b/examples/quick/controls/gallery/content/ModelView.qml
@@ -51,7 +51,7 @@ Item {
     width: 600
     height: 300
     anchors.fill: parent
-    anchors.margins: Qt.platform.os === "mac" ? 12 : 0
+    anchors.margins: Qt.platform.os === "mac" ? 12 : 6
 
 //    XmlListModel {
 //        id: flickerModel
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 6efee30db5d7475070817490cffb8d7f0089b474..ca0df45a18b2379ec6d7c897df1772becbc8510a 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -515,7 +515,7 @@ ScrollView {
             anchors.margins: viewport.anchors.margins
             anchors.rightMargin: __scroller.rightMargin +
                                  (__scroller.outerFrame && __scrollBarTopMargin ? 0 : __verticalScrollBar.width
-                                                          + __scroller.scrollBarSpacing)
+                                                          + __scroller.scrollBarSpacing + root.__style.padding.right)
 
             anchors.left: parent.left
             anchors.right: parent.right