diff --git a/modules/Backlight.qml b/modules/Backlight.qml
index 525cdab..dfb7149 100644
--- a/modules/Backlight.qml
+++ b/modules/Backlight.qml
@@ -170,10 +170,8 @@ M.BarSection {
             onFinished: panel._winVisible = false
         }
 
-        MouseArea {
-            anchors.fill: parent
-            hoverEnabled: true
-            onContainsMouseChanged: root._panelHovered = containsMouse
+        HoverHandler {
+            onHoveredChanged: root._panelHovered = hovered
         }
 
         Rectangle {
diff --git a/modules/Mpris.qml b/modules/Mpris.qml
index 474efac..60c0760 100644
--- a/modules/Mpris.qml
+++ b/modules/Mpris.qml
@@ -176,10 +176,8 @@ M.BarSection {
             onFinished: panel._winVisible = false
         }
 
-        MouseArea {
-            anchors.fill: parent
-            hoverEnabled: true
-            onContainsMouseChanged: root._panelHovered = containsMouse
+        HoverHandler {
+            onHoveredChanged: root._panelHovered = hovered
         }
 
         Rectangle {
diff --git a/modules/Volume.qml b/modules/Volume.qml
index ea31282..d337202 100644
--- a/modules/Volume.qml
+++ b/modules/Volume.qml
@@ -180,10 +180,8 @@ M.BarSection {
         }
 
         // Keep panel open when mouse is over it
-        MouseArea {
-            anchors.fill: parent
-            hoverEnabled: true
-            onContainsMouseChanged: root._panelHovered = containsMouse
+        HoverHandler {
+            onHoveredChanged: root._panelHovered = hovered
             // Click inside panel doesn't dismiss
         }