diff --git a/src/blackinput/macos/keyboardmacos.h b/src/blackinput/macos/keyboardmacos.h
index 1e3ef501d..8cb696039 100644
--- a/src/blackinput/macos/keyboardmacos.h
+++ b/src/blackinput/macos/keyboardmacos.h
@@ -54,7 +54,8 @@ namespace BlackInput
                                      void *refcon);
 
         BlackMisc::Input::CHotkeyCombination m_keyCombination; //!< Current status of pressed keys;
-        CFMachPortRef m_eventTap;
+        CFMachPortRef m_eventTap = nullptr;
+        CFRunLoopSourceRef m_sourceRef = nullptr;
     };
 } // ns
 
diff --git a/src/blackinput/macos/keyboardmacos.mm b/src/blackinput/macos/keyboardmacos.mm
index 45069f91e..fd69a2e04 100644
--- a/src/blackinput/macos/keyboardmacos.mm
+++ b/src/blackinput/macos/keyboardmacos.mm
@@ -87,6 +87,13 @@ namespace BlackInput
 
     CKeyboardMacOS::~CKeyboardMacOS()
     {
+        if (m_eventTap) { CGEventTapEnable(m_eventTap, false); }
+        if (m_sourceRef)
+        {
+            CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_sourceRef, kCFRunLoopCommonModes);
+            CFRelease(m_sourceRef);
+        }
+        if (m_eventTap) { CFRelease(m_eventTap); }
     }
 
     bool CKeyboardMacOS::init()
@@ -104,30 +111,28 @@ namespace BlackInput
                                       &kCFTypeDictionaryValueCallBacks);
 
         bool accessibilityEnabled = AXIsProcessTrustedWithOptions(options);
-
+        CFRelease(options);
         if (!accessibilityEnabled)
         {
             QMessageBox msgBox;
-            msgBox.setText("In order to enable hotkeys first add Swift to the list of apps allowed to "
+            msgBox.setText("In order to enable hotkeys first add swift to the list of apps allowed to "
                            "control your computer in System Preferences / Security & Privacy / Privacy / Accessiblity and then restart Swift.");
             msgBox.exec();
-
             return false;
         }
 
-
         CGEventMask eventMask = ((1 << kCGEventKeyDown) | (1 << kCGEventKeyUp) | (1 << kCGEventFlagsChanged));
 
         // try creating an event tap just for keypresses. if it fails, we need Universal Access.
         m_eventTap = CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault,
                                  eventMask, myCGEventCallback, this);
+        if (! m_eventTap) { return false; }
 
-        CFRunLoopSourceRef source = CFMachPortCreateRunLoopSource(kCFAllocatorDefault,
-                                    m_eventTap, 0);
+        m_sourceRef = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, m_eventTap, 0);
+        if (! m_sourceRef) { return false; }
 
-        CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes);
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), m_sourceRef, kCFRunLoopCommonModes);
         CGEventTapEnable(m_eventTap, true);
-
         return true;
     }
 
@@ -218,6 +223,8 @@ namespace BlackInput
             CGEventRef event,
             void *refcon)
     {
+        // If disabled on purpose, don't do anything further.
+        if (type == kCGEventTapDisabledByUserInput) { return event; }
 
         CKeyboardMacOS *keyboardMac = static_cast<CKeyboardMacOS*>(refcon);
         if (type == kCGEventTapDisabledByTimeout)