diff --git a/MTMR/CustomButtonTouchBarItem.swift b/MTMR/CustomButtonTouchBarItem.swift
index 51d4d7e..6197bda 100644
--- a/MTMR/CustomButtonTouchBarItem.swift
+++ b/MTMR/CustomButtonTouchBarItem.swift
@@ -9,16 +9,6 @@
 import Cocoa
 
 class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
-    var tapClosure: (() -> Void)? {
-        didSet {
-            actions[.singleTap] = tapClosure
-        }
-    }
-    var longTapClosure: (() -> Void)? {
-        didSet {
-            actions[.longTap] = longTapClosure
-        }
-    }
     typealias TriggerClosure = (() -> Void)?
     var actions: [Action.Trigger: TriggerClosure] = [:] {
         didSet {
diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift
index 3c630e2..491b121 100644
--- a/MTMR/TouchBarController.swift
+++ b/MTMR/TouchBarController.swift
@@ -323,10 +323,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         }
 
         if let action = self.action(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
-            item.tapClosure = action
+            item.actions[.singleTap] = action
         }
         if let longAction = self.longAction(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
-            item.longTapClosure = longAction
+            item.actions[.longTap] = longAction
         }
         
         if let touchBarItem = barItem as? CustomButtonTouchBarItem {
diff --git a/MTMR/Widgets/AppScrubberTouchBarItem.swift b/MTMR/Widgets/AppScrubberTouchBarItem.swift
index adc5541..c864b00 100644
--- a/MTMR/Widgets/AppScrubberTouchBarItem.swift
+++ b/MTMR/Widgets/AppScrubberTouchBarItem.swift
@@ -82,10 +82,10 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem {
     public func createAppButton(for app: DockItem) -> DockBarItem {
         let item = DockBarItem(app)
         item.isBordered = false
-        item.tapClosure = { [weak self] in
+        item.actions[.singleTap] = { [weak self] in
             self?.switchToApp(app: app)
         }
-        item.longTapClosure = { [weak self] in
+        item.actions[.longTap] = { [weak self] in
             self?.handleHalfLongPress(item: app)
         }
         item.killAppClosure = {[weak self] in
diff --git a/MTMR/Widgets/InputSourceBarItem.swift b/MTMR/Widgets/InputSourceBarItem.swift
index 6e8b15b..2d27d4a 100644
--- a/MTMR/Widgets/InputSourceBarItem.swift
+++ b/MTMR/Widgets/InputSourceBarItem.swift
@@ -18,7 +18,7 @@ class InputSourceBarItem: CustomButtonTouchBarItem {
 
         observeIputSourceChangedNotification()
         textInputSourceDidChange()
-        tapClosure = { [weak self] in
+        actions[.singleTap] = { [weak self] in
             self?.switchInputSource()
         }
     }