diff --git a/modules/BluetoothMenu.qml b/modules/BluetoothMenu.qml
index 1eb9d5f..b6b97d3 100644
--- a/modules/BluetoothMenu.qml
+++ b/modules/BluetoothMenu.qml
@@ -73,7 +73,7 @@ M.HoverPanel {
             anchors.fill: parent
             anchors.leftMargin: 4
             anchors.rightMargin: 4
-            color: btHeaderArea.containsMouse ? M.Theme.base02 : "transparent"
+            color: btHeaderHover.hovered ? M.Theme.base02 : "transparent"
             radius: M.Theme.radius
         }
 
@@ -109,12 +109,12 @@ M.HoverPanel {
             font.family: M.Theme.iconFontFamily
         }
 
-        MouseArea {
-            id: btHeaderArea
-            anchors.fill: parent
-            hoverEnabled: true
+        HoverHandler {
+            id: btHeaderHover
             cursorShape: Qt.PointingHandCursor
-            onClicked: {
+        }
+        TapHandler {
+            onTapped: {
                 powerProc._action = menuWindow._btEnabled ? "off" : "on";
                 powerProc.running = true;
             }
@@ -143,7 +143,7 @@ M.HoverPanel {
                 anchors.fill: parent
                 anchors.leftMargin: 4
                 anchors.rightMargin: 4
-                color: entryArea.containsMouse ? M.Theme.base02 : "transparent"
+                color: entryHover.hovered ? M.Theme.base02 : "transparent"
                 radius: M.Theme.radius
             }
 
@@ -184,12 +184,12 @@ M.HoverPanel {
                 width: entry.modelData.battery >= 0 ? implicitWidth : 0
             }
 
-            MouseArea {
-                id: entryArea
-                anchors.fill: parent
-                hoverEnabled: true
+            HoverHandler {
+                id: entryHover
                 cursorShape: Qt.PointingHandCursor
-                onClicked: {
+            }
+            TapHandler {
+                onTapped: {
                     toggleProc.action = entry.modelData.connected ? "disconnect" : "connect";
                     toggleProc.mac = entry.modelData.mac;
                     toggleProc.running = true;
diff --git a/modules/NetworkMenu.qml b/modules/NetworkMenu.qml
index a2798d8..2bc7b67 100644
--- a/modules/NetworkMenu.qml
+++ b/modules/NetworkMenu.qml
@@ -104,7 +104,7 @@ M.HoverPanel {
             anchors.fill: parent
             anchors.leftMargin: 4
             anchors.rightMargin: 4
-            color: headerArea.containsMouse ? M.Theme.base02 : "transparent"
+            color: headerHover.hovered ? M.Theme.base02 : "transparent"
             radius: M.Theme.radius
         }
 
@@ -140,12 +140,12 @@ M.HoverPanel {
             font.family: M.Theme.iconFontFamily
         }
 
-        MouseArea {
-            id: headerArea
-            anchors.fill: parent
-            hoverEnabled: true
+        HoverHandler {
+            id: headerHover
             cursorShape: Qt.PointingHandCursor
-            onClicked: {
+        }
+        TapHandler {
+            onTapped: {
                 radioProc._state = menuWindow._wifiEnabled ? "off" : "on";
                 radioProc.running = true;
             }
@@ -174,7 +174,7 @@ M.HoverPanel {
                 anchors.fill: parent
                 anchors.leftMargin: 4
                 anchors.rightMargin: 4
-                color: entryArea.containsMouse ? M.Theme.base02 : "transparent"
+                color: entryHover.hovered ? M.Theme.base02 : "transparent"
                 radius: M.Theme.radius
             }
 
@@ -215,12 +215,12 @@ M.HoverPanel {
                 width: entry.modelData.signal >= 0 ? implicitWidth : 0
             }
 
-            MouseArea {
-                id: entryArea
-                anchors.fill: parent
-                hoverEnabled: true
+            HoverHandler {
+                id: entryHover
                 cursorShape: Qt.PointingHandCursor
-                onClicked: {
+            }
+            TapHandler {
+                onTapped: {
                     if (entry.modelData.active) {
                         disconnectProc.uuid = entry.modelData.uuid;
                         disconnectProc.running = true;