diff --git a/shell/applets/BluetoothApplet.qml b/shell/applets/BluetoothApplet.qml
index a93b15e..1f7eeb4 100644
--- a/shell/applets/BluetoothApplet.qml
+++ b/shell/applets/BluetoothApplet.qml
@@ -72,11 +72,9 @@ Column {
                     entry.opacity = 1
             }
 
-            TapHandler {
-                onTapped: {
-                    if (!entry._pending)
-                        S.BluetoothService.toggleDevice(entry.modelData.mac, !entry.modelData.connected);
-                }
+            onTapped: {
+                if (!entry._pending)
+                    S.BluetoothService.toggleDevice(entry.modelData.mac, !entry.modelData.connected);
             }
         }
     }
diff --git a/shell/applets/HoverableListItem.qml b/shell/applets/HoverableListItem.qml
index 2dcd125..2bb7262 100644
--- a/shell/applets/HoverableListItem.qml
+++ b/shell/applets/HoverableListItem.qml
@@ -5,6 +5,7 @@ Item {
     id: root
 
     readonly property bool hovered: _hover.hovered
+    signal tapped
 
     width: parent?.width ?? 0
     height: 32
@@ -22,4 +23,8 @@ Item {
         id: _hover
         cursorShape: Qt.PointingHandCursor
     }
+
+    TapHandler {
+        onTapped: root.tapped()
+    }
 }
diff --git a/shell/applets/NetworkApplet.qml b/shell/applets/NetworkApplet.qml
index bf41dc6..2344e7d 100644
--- a/shell/applets/NetworkApplet.qml
+++ b/shell/applets/NetworkApplet.qml
@@ -51,13 +51,11 @@ Column {
                 width: entry.modelData.signal >= 0 ? implicitWidth : 0
             }
 
-            TapHandler {
-                onTapped: {
-                    if (entry.modelData.active)
-                        S.NetworkService.disconnectNetwork(entry.modelData.uuid);
-                    else
-                        S.NetworkService.connectNetwork(entry.modelData.uuid);
-                }
+            onTapped: {
+                if (entry.modelData.active)
+                    S.NetworkService.disconnectNetwork(entry.modelData.uuid);
+                else
+                    S.NetworkService.connectNetwork(entry.modelData.uuid);
             }
         }
     }
diff --git a/shell/applets/VolumeApplet.qml b/shell/applets/VolumeApplet.qml
index c1aa20e..ec06e85 100644
--- a/shell/applets/VolumeApplet.qml
+++ b/shell/applets/VolumeApplet.qml
@@ -142,9 +142,7 @@ Column {
                         elide: Text.ElideRight
                     }
 
-                    TapHandler {
-                        onTapped: Pipewire.preferredDefaultAudioSink = modelData
-                    }
+                    onTapped: Pipewire.preferredDefaultAudioSink = modelData
                 }
             }
         }