diff --git a/modules/TrayMenu.qml b/modules/TrayMenu.qml
index 1278b43..36794ee 100644
--- a/modules/TrayMenu.qml
+++ b/modules/TrayMenu.qml
@@ -2,9 +2,11 @@ import QtQuick
 import Quickshell
 import "." as M
 
-M.PopupPanel {
+M.HoverPanel {
     id: menuWindow
 
+    popupMode: true
+
     required property var handle
 
     property var _currentHandle: handle
@@ -17,7 +19,7 @@ M.PopupPanel {
     // Back button (submenus only)
     Item {
         visible: menuWindow._handleStack.length > 0
-        width: menuWindow.panelWidth
+        width: menuWindow.contentWidth
         height: visible ? 28 : 0
 
         Rectangle {
@@ -58,7 +60,7 @@ M.PopupPanel {
 
             required property QsMenuEntry modelData
 
-            width: menuWindow.panelWidth
+            width: menuWindow.contentWidth
             height: modelData.isSeparator ? 9 : 28
 
             Rectangle {
diff --git a/modules/Volume.qml b/modules/Volume.qml
index 1b55d60..e505d75 100644
--- a/modules/Volume.qml
+++ b/modules/Volume.qml
@@ -220,11 +220,12 @@ M.BarSection {
         id: mixerLoader
         active: false
 
-        M.PopupPanel {
+        M.HoverPanel {
+            popupMode: true
             accentColor: root.accentColor
             screen: root.bar.screen
             anchorX: root.mapToGlobal(root.width / 2, 0).x - (root.bar.screen?.x ?? 0)
-            panelWidth: 220
+            contentWidth: 220
             onDismissed: mixerLoader.active = false
 
             // Output devices