3 files changed, 19 insertions, 6 deletions
diff --git a/modules/controlcenter/bluetooth/BtPane.qml b/modules/controlcenter/bluetooth/BtPane.qml
index 32d2c0d..8ad4b1f 100644
--- a/modules/controlcenter/bluetooth/BtPane.qml
+++ b/modules/controlcenter/bluetooth/BtPane.qml
@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import ".."
+import qs.components.controls
 import qs.components.effects
 import qs.components.containers
 import qs.config
@@ -131,14 +132,20 @@ RowLayout {
             id: settings
 
             StyledFlickable {
+                id: settingsFlickable
                 flickableDirection: Flickable.VerticalFlick
                 contentHeight: settingsInner.height
 
+                StyledScrollBar.vertical: StyledScrollBar {
+                    flickable: settingsFlickable
+                }
+
                 Settings {
                     id: settingsInner
 
                     anchors.left: parent.left
                     anchors.right: parent.right
+                    anchors.top: parent.top
                     session: root.session
                 }
             }
diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml
index 7ac5286..883b408 100644
--- a/modules/controlcenter/bluetooth/Details.qml
+++ b/modules/controlcenter/bluetooth/Details.qml
@@ -18,11 +18,13 @@ StyledFlickable {
     required property Session session
     readonly property BluetoothDevice device: session.bt.active
 
-    anchors.fill: parent
-
     flickableDirection: Flickable.VerticalFlick
     contentHeight: layoutWrapper.height
 
+    StyledScrollBar.vertical: StyledScrollBar {
+        flickable: root
+    }
+
         Item {
             id: layoutWrapper
 
diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml
index fd33af9..c8453b6 100644
--- a/modules/controlcenter/bluetooth/Settings.qml
+++ b/modules/controlcenter/bluetooth/Settings.qml
@@ -284,8 +284,12 @@ ColumnLayout {
 
                 CustomSpinBox {
                     min: 0
-                    value: root.session.bt.currentAdapter.discoverableTimeout
-                    onValueModified: value => root.session.bt.currentAdapter.discoverableTimeout = value
+                    value: root.session.bt.currentAdapter?.discoverableTimeout ?? 0
+                    onValueModified: value => {
+                        if (root.session.bt.currentAdapter) {
+                            root.session.bt.currentAdapter.discoverableTimeout = value;
+                        }
+                    }
                 }
             }
 
@@ -345,7 +349,7 @@ ColumnLayout {
                         anchors.top: renameLabel.bottom
                         anchors.leftMargin: root.session.bt.editingAdapterName ? 0 : -Appearance.padding.normal
 
-                        text: root.session.bt.currentAdapter.name
+                        text: root.session.bt.currentAdapter?.name ?? ""
                         readOnly: !root.session.bt.editingAdapterName
                         onAccepted: {
                             root.session.bt.editingAdapterName = false;
@@ -392,7 +396,7 @@ ColumnLayout {
 
                         function onClicked(): void {
                             root.session.bt.editingAdapterName = false;
-                            adapterNameEdit.text = Qt.binding(() => root.session.bt.currentAdapter.name);
+                            adapterNameEdit.text = Qt.binding(() => root.session.bt.currentAdapter?.name ?? "");
                         }
                     }