diff --git a/components/PageGensetModel.qml b/components/PageGensetModel.qml
index ee2c31f15..6caa73d6a 100644
--- a/components/PageGensetModel.qml
+++ b/components/PageGensetModel.qml
@@ -132,7 +132,7 @@ VisibleItemModel {
 		}
 
 		preferredVisible: _dataItem.isValid
-		enabled: secondaryText !== CommonWords.none_errors
+		interactive: secondaryText !== CommonWords.none_errors
 
 		onClicked: Global.notificationLayer.popAndGoToNotifications()
 
@@ -336,7 +336,7 @@ VisibleItemModel {
 							stepSize: 0.1
 							suffix: Units.defaultUnitString(VenusOS.Units_Volt_DC)
 							preferredVisible: dataItem.isValid
-							enabled: bmsControlled.dataItem.value === 0
+							interactive: dataItem.isValid && bmsControlled.dataItem.value === 0
 						}
 
 						ListText {
diff --git a/components/dialogs/InverterChargerModeDialog.qml b/components/dialogs/InverterChargerModeDialog.qml
index d2cea7952..ce83fd314 100644
--- a/components/dialogs/InverterChargerModeDialog.qml
+++ b/components/dialogs/InverterChargerModeDialog.qml
@@ -92,7 +92,7 @@ ModalDialog {
 
 			ListRadioButton {
 				flat: true
-				enabled: modelData.enabled !== false
+				interactive: modelData.enabled !== false
 				visible: modelData.visible !== false
 				checked: modelData.value === root.mode
 				text: root.showInverterModesOnly
diff --git a/components/widgets/DcLoadsWidget.qml b/components/widgets/DcLoadsWidget.qml
index c2627a0dc..1eaa0c341 100644
--- a/components/widgets/DcLoadsWidget.qml
+++ b/components/widgets/DcLoadsWidget.qml
@@ -55,19 +55,13 @@ OverviewWidget {
 						Units.getCombinedDisplayText(VenusOS.Units_Watt, dcDevice.power),
 					]
 
+					onClicked: root._showSettingsPage(device)
+
 					DcDevice {
 						id: dcDevice
 						serviceUid: deviceDelegate.device.serviceUid
 					}
 
-					ListPressArea {
-						id: delegatePressArea
-
-						anchors.fill: parent.backgroundRect
-						radius: backgroundRect.radius
-						onClicked: root._showSettingsPage(device)
-					}
-
 					CP.ColorImage {
 						parent: deviceDelegate.content
 						anchors.verticalCenter: parent.verticalCenter