diff --git a/MTMR/BatteryBarItem.swift b/MTMR/BatteryBarItem.swift
index 69de2ce..3b107ec 100644
--- a/MTMR/BatteryBarItem.swift
+++ b/MTMR/BatteryBarItem.swift
@@ -9,12 +9,11 @@
 import IOKit.ps
 import Foundation
 
-class BatteryBarItem: NSCustomTouchBarItem {
+class BatteryBarItem: CustomButtonTouchBarItem {
     private var timer: Timer!
-    private let button = NSButton(title: "", target: nil, action: nil)
     
-    override init(identifier: NSTouchBarItem.Identifier) {
-        super.init(identifier: identifier)
+    init(identifier: NSTouchBarItem.Identifier, onTap: @escaping () -> ()) {
+        super.init(identifier: identifier, title: " ", onTap: onTap)
         self.view = button
         button.bezelColor = .clear
         
diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift
index 92f74fa..4b2ba47 100644
--- a/MTMR/TouchBarController.swift
+++ b/MTMR/TouchBarController.swift
@@ -172,7 +172,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         case .timeButton(formatTemplate: let template):
             barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template)
         case .battery():
-            barItem = BatteryBarItem(identifier: identifier)
+            barItem = BatteryBarItem(identifier: identifier, onTap: action)
         case .dock:
             barItem = AppScrubberTouchBarItem(identifier: identifier)
         case .volume: