diff --git a/Modules/Bar/Extras/BarPillHorizontal.qml b/Modules/Bar/Extras/BarPillHorizontal.qml
index 0e4b548c..f32bfc48 100644
--- a/Modules/Bar/Extras/BarPillHorizontal.qml
+++ b/Modules/Bar/Extras/BarPillHorizontal.qml
@@ -20,7 +20,7 @@ Item {
   property bool compact: false
 
   // Effective shown state (true if hovered/animated open or forced)
-  readonly property bool revealed: forceOpen || showPill
+  readonly property bool revealed: !forceClose && (forceOpen || showPill)
 
   signal shown
   signal hidden
@@ -221,7 +221,7 @@ Item {
       hovered = true
       root.entered()
       tooltip.show()
-      if (disableOpen) {
+      if (disableOpen || forceClose) {
         return
       }
       if (!forceOpen) {
@@ -231,7 +231,7 @@ Item {
     onExited: {
       hovered = false
       root.exited()
-      if (!forceOpen) {
+      if (!forceOpen && !forceClose) {
         hide()
       }
       tooltip.hide()
diff --git a/Modules/Settings/Tabs/AudioTab.qml b/Modules/Settings/Tabs/AudioTab.qml
index 5fcc472d..81b40dd4 100644
--- a/Modules/Settings/Tabs/AudioTab.qml
+++ b/Modules/Settings/Tabs/AudioTab.qml
@@ -135,7 +135,7 @@ ColumnLayout {
 
     NToggle {
       label: "Allow volume overdrive"
-      description: "Allow raising volume above 100%."
+      description: "Allow raising volume above 100%. May not be supported by all hardware."
       checked: Settings.data.audio.volumeOverdrive
       onToggled: checked => Settings.data.audio.volumeOverdrive = checked
     }
@@ -178,7 +178,10 @@ ColumnLayout {
           required property PwNode modelData
           ButtonGroup.group: sinks
           checked: AudioService.sink?.id === modelData.id
-          onClicked: AudioService.setAudioSink(modelData)
+          onClicked: {
+            AudioService.setAudioSink(modelData)
+            localVolume = AudioService.volume
+          }
           text: modelData.description
         }
       }