diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift
index bdb709ad..8a119d6d 100644
--- a/VoidLink/Input/OnScreenWidgetView.swift
+++ b/VoidLink/Input/OnScreenWidgetView.swift
@@ -158,6 +158,7 @@ import SVGKit
     @objc public var isMousePadWithButtonActions: Bool = false
     @objc public var hasInertia: Bool = false
     @objc public var isFunctionalButton: Bool = false
+    @objc public var isTapToToggleException: Bool = false
     @objc public var hasHapticFeedback: Bool = false
     @objc public var isDirectionPad: Bool = false
     @objc public var hasL3R3Indicator: Bool = false
@@ -462,6 +463,10 @@ import SVGKit
         self.isMousePadWithButtonActions = CommandManager.mousePadWithButtonActions.contains(self.touchPadString) && widgetType == WidgetTypeEnum.touchPad
         self.hasInertia = CommandManager.inertialTouchPads.contains(self.touchPadString)
         self.isFunctionalButton = self.functionalButtonString != "" || self.cmdString.contains("+")
+        self.isTapToToggleException = (self.functionalButtonString == "NOSINGLETOUCH"
+                                       || self.functionalButtonString == "PENCILHOVER"
+                                       || self.functionalButtonString == "ABSTCHDRAG"
+                                    )
         self.hasHapticFeedback = !self.comboButtonStrings.isEmpty || CommandManager.directionPads.contains(self.touchPadString)
         self.isDirectionPad = self.widgetType == WidgetTypeEnum.touchPad && CommandManager.directionPads.contains(self.touchPadString)
         self.isStickWheel = self.widgetType == WidgetTypeEnum.touchPad && CommandManager.stickWheels.contains(self.touchPadString)
diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
index d7cd7f23..75171fb3 100644
--- a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
+++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
@@ -1119,7 +1119,7 @@ typedef NS_ENUM(NSUInteger, DecelerationRateSliderMode) {
     [self.buttonModeSelector setEnabled:slideAndHoldEnabled forSegmentAtIndex:slideAndHold];
     [self.buttonModeSelector setEnabled:!selectedWidgetView.isFolder forSegmentAtIndex:regular];
     [self.buttonModeSelector setEnabled:!selectedWidgetView.isFunctionalButton
-     || [selectedWidgetView.functionalButtonString containsString:@"ABSTCHDRAG"]
+     || selectedWidgetView.isTapToToggleException
                       forSegmentAtIndex:tapToToggle];
     [self.buttonModeSelector setSelectedSegmentIndex:selectedWidgetView.buttonMode];