diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index c209faf0..cf8984a5 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -273,12 +273,13 @@ Rectangle {
             clip: true
 
             ScrollBar.vertical: ScrollBar {
-                parent: wizardFlickable.parent
+                parent: wizardController
                 anchors.left: parent.right
-                anchors.leftMargin: 3
+                anchors.leftMargin: -14 // 10 margin + 4 scrollbar width
                 anchors.top: parent.top
-                anchors.topMargin: 4
+                anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
                 anchors.bottom: parent.bottom
+                anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
             }
 
             onFlickingChanged: {