diff --git a/org.kde.desktop/ScrollView.qml b/org.kde.desktop/ScrollView.qml
index a318610..34adc61 100644
--- a/org.kde.desktop/ScrollView.qml
+++ b/org.kde.desktop/ScrollView.qml
@@ -1,110 +1,121 @@
 /*
  * Copyright 2017 Marco Martin <mart@kde.org>
  * Copyright 2017 The Qt Company Ltd.
  *
  * GNU Lesser General Public License Usage
  * Alternatively, this file may be used under the terms of the GNU Lesser
  * General Public License version 3 as published by the Free Software
  * Foundation and appearing in the file LICENSE.LGPLv3 included in the
  * packaging of this file. Please review the following information to
  * ensure the GNU Lesser General Public License version 3 requirements
  * will be met: https://www.gnu.org/licenses/lgpl.html.
  *
  * GNU General Public License Usage
  * Alternatively, this file may be used under the terms of the GNU
  * General Public License version 2.0 or later as published by the Free
  * Software Foundation and appearing in the file LICENSE.GPL included in
  * the packaging of this file. Please review the following information to
  * ensure the GNU General Public License version 2.0 requirements will be
  * met: http://www.gnu.org/licenses/gpl-2.0.html.
  */
 
 
 import QtQuick 2.9
 import QtQuick.Controls @QQC2_VERSION@
 import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.kirigami 2.9 as Kirigami
 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
 
 T.ScrollView {
     id: controlRoot
 
     clip: true
 
     @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
     implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
 
     Kirigami.Theme.colorSet: Kirigami.Theme.View
     Kirigami.Theme.inherit: !background || !background.visible
 
     //size in pixel to accomodate the border drawn by qstyle
-    leftPadding: background && background.visible && background.hasOwnProperty("leftPadding") ? background.leftPadding : 0
-    topPadding: background && background.visible && background.hasOwnProperty("topPadding") ? background.topPadding : 0
-    rightPadding: background && background.visible && background.hasOwnProperty("rightPadding") ? background.rightPadding : 0
-    bottomPadding: background && background.visible && background.hasOwnProperty("bottomPadding") ? background.bottomPadding : 0
+    leftPadding: (internal.backgroundVisible && background.hasOwnProperty("leftPadding") ? background.leftPadding : 0)
+                    + (LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0)
+    topPadding: internal.backgroundVisible && background.hasOwnProperty("topPadding") ? background.topPadding : 0
+    rightPadding: (internal.backgroundVisible && background.hasOwnProperty("rightPadding") ? background.rightPadding : 0)
+                    + (!LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0)
+    bottomPadding: (internal.backgroundVisible && background.hasOwnProperty("bottomPadding") ? background.bottomPadding : 0)
+                    + internal.horizontalScrollBarWidth
 
     //create a background only after Component.onCompleted, see on the component creation below for explanation
     Component.onCompleted: {
         if (!controlRoot.background) {
             controlRoot.background = backgroundComponent.createObject(controlRoot);
         }
     }
 
     data: [
         Kirigami.WheelHandler {
             target: controlRoot.contentItem
         },
         /*create a background only after Component.onCompleted because:
         * implementations can set their own background in a declarative way
         * ScrollView {background.visible: true} must *not* work, because all upstream styles don't have a background so applications using this would break with other styles
         * This is child of scrollHelper as it would break native scrollview finding of the flickable if it was a direct child
         */
         Component {
             id: backgroundComponent
             StylePrivate.StyleItem {
                 control: controlRoot.contentItem
                 elementType: "edit"
                 property int leftPadding: frame.leftPadding
                 property int topPadding: frame.topPadding
                 property int rightPadding: frame.rightPadding
                 property int bottomPadding: frame.bottomPadding
                 visible: false
                 sunken: true
                 raised: false
                 enabled: controlRoot.contentItem.enabled
                 hasFocus: controlRoot.activeFocus || controlRoot.contentItem.activeFocus
                 hover: controlRoot.hovered
                 //This is just for the proper margin metrics
                 StylePrivate.StyleItem {
                     id: frame
                     anchors.fill:parent
                     control: controlRoot
                     elementType: "frame"
                     visible: false
                     sunken: true
                     hasFocus: controlRoot.activeFocus || controlRoot.contentItem.activeFocus
                     hover: controlRoot.hovered
                 }
             }
+        },
+
+        QtObject {
+            id: internal
+
+            readonly property bool backgroundVisible: controlRoot.background && controlRoot.background.visible
+            readonly property real verticalScrollBarWidth: controlRoot.ScrollBar.vertical.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.vertical.width : 0
+            readonly property real horizontalScrollBarWidth: controlRoot.ScrollBar.horizontal.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.horizontal.width : 0
         }
     ]
     ScrollBar.vertical: ScrollBar {
         id: verticalScrollBar
         parent: controlRoot
         enabled: controlRoot.contentItem.enabled
         x: controlRoot.mirrored ? 0 : controlRoot.width - width
         y: controlRoot.topPadding
         height: controlRoot.availableHeight
         active: controlRoot.ScrollBar.horizontal || controlRoot.ScrollBar.horizontal.active
     }
 
     ScrollBar.horizontal: ScrollBar {
         parent: controlRoot
         enabled: controlRoot.contentItem.enabled
         x: controlRoot.leftPadding
         y: controlRoot.height - height
         width: controlRoot.availableWidth
         active: controlRoot.ScrollBar.vertical || controlRoot.ScrollBar.vertical.active
     }
 }