diff --git a/Components/CustomScrollBar.qml b/Components/CustomScrollBar.qml
index dedd428..f889cac 100644
--- a/Components/CustomScrollBar.qml
+++ b/Components/CustomScrollBar.qml
@@ -17,12 +17,9 @@ ScrollBar {
 	property bool shouldBeActive
 	readonly property real travelScale: root.rawTravel > 0 ? root.effectiveTravel / root.rawTravel : 0
 
-	property bool shouldBeActive
-	property bool inverted
-
 	enabled: !ShellState.forActive().isDrawing
-	implicitWidth: size === 1 ? 0 : isHorizontal ? 0 : Tokens.padding.extraSmall * 2
-	implicitHeight: size === 1 ? 0 : isHorizontal ? Tokens.padding.extraSmall * 2 : 0
+	implicitHeight: Tokens.padding.extraSmall * 2
+	implicitWidth: Tokens.padding.extraSmall * 2
 
 	contentItem: Item {
 	}
diff --git a/Drawers/Panels.qml b/Drawers/Panels.qml
index 18ecd64..50dd9c8 100644
--- a/Drawers/Panels.qml
+++ b/Drawers/Panels.qml
@@ -37,12 +37,12 @@ Item {
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
 	required property ShellScreen screen
+	required property ScreenState screenState
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
-	required property ScreenState screenState
 
 	anchors.bottomMargin: geometry.insetBottom(borderThickness)
 	anchors.fill: parent
@@ -84,8 +84,8 @@ Item {
 			anchors.right: parent.right
 			anchors.verticalCenter: parent.verticalCenter
 			screen: root.screen
-			sidebarOrSessionVisible: sidebar.visible
 			screenState: root.screenState
+			sidebarOrSessionVisible: sidebar.visible
 		}
 	}
 
@@ -121,8 +121,8 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
-		sidebarPanel: sidebar
 		screenState: root.screenState
+		sidebarPanel: sidebar
 	}
 
 	Launcher.Wrapper {
@@ -140,9 +140,8 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		popouts: popouts
-		sidebar: sidebar
 		screenState: root.screenState
+		sidebar: sidebar
 	}
 
 	Item {
@@ -150,8 +149,8 @@ Item {
 
 		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
 
-		anchors.top: parent.top
 		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
 		clip: true
 		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
 		implicitWidth: dashboard.implicitWidth
diff --git a/Modules/Settings/Common/DialogSelectButton.qml b/Modules/Settings/Common/DialogSelectButton.qml
index 5866d6b..505f58b 100644
--- a/Modules/Settings/Common/DialogSelectButton.qml
+++ b/Modules/Settings/Common/DialogSelectButton.qml
@@ -8,6 +8,7 @@ import qs.Services
 DialogRowButton {
 	id: root
 
+	property var initialSelect
 	required property var model
 	property var selectedItem