diff --git a/alt-tab-macos/logic/Keyboard.swift b/alt-tab-macos/logic/Keyboard.swift
index 8e06d1b1..97e8c4c7 100644
--- a/alt-tab-macos/logic/Keyboard.swift
+++ b/alt-tab-macos/logic/Keyboard.swift
@@ -22,21 +22,23 @@ class Keyboard {
 var eventTap: CFMachPort?
 
 func listenToGlobalKeyboardEvents(_ delegate: Application) {
-    let eventMask = [CGEventType.keyDown, CGEventType.keyUp, CGEventType.flagsChanged].reduce(CGEventMask(0), { $0 | (1 << $1.rawValue) })
-    eventTap = CGEvent.tapCreate(
-            tap: .cgSessionEventTap,
-            place: .headInsertEventTap,
-            options: .defaultTap,
-            eventsOfInterest: CGEventMask(eventMask),
-            callback: { (_, _, event, delegate_) -> Unmanaged<CGEvent>? in
-                let d = Unmanaged<Application>.fromOpaque(delegate_!).takeUnretainedValue()
-                return keyboardHandler(event, d)
-            },
-            userInfo: UnsafeMutableRawPointer(Unmanaged.passUnretained(delegate).toOpaque()))
-    let runLoopSource = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, eventTap, 0)
-    CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, .commonModes)
-    CGEvent.tapEnable(tap: eventTap!, enable: true)
-    CFRunLoopRun()
+    DispatchQueue.global(qos: .userInteractive).async {
+        let eventMask = [CGEventType.keyDown, CGEventType.keyUp, CGEventType.flagsChanged].reduce(CGEventMask(0), { $0 | (1 << $1.rawValue) })
+        eventTap = CGEvent.tapCreate(
+                tap: .cgSessionEventTap,
+                place: .headInsertEventTap,
+                options: .defaultTap,
+                eventsOfInterest: CGEventMask(eventMask),
+                callback: { (_, _, event, delegate_) -> Unmanaged<CGEvent>? in
+                    let d = Unmanaged<Application>.fromOpaque(delegate_!).takeUnretainedValue()
+                    return keyboardHandler(event, d)
+                },
+                userInfo: UnsafeMutableRawPointer(Unmanaged.passUnretained(delegate).toOpaque()))
+        let runLoopSource = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, eventTap, 0)
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, .commonModes)
+        CGEvent.tapEnable(tap: eventTap!, enable: true)
+        CFRunLoopRun()
+    }
 }
 
 func keyboardHandler(_ cgEvent: CGEvent, _ delegate: Application) -> Unmanaged<CGEvent>? {
diff --git a/alt-tab-macos/ui/Application.swift b/alt-tab-macos/ui/Application.swift
index 1eb09c8e..b14c868b 100644
--- a/alt-tab-macos/ui/Application.swift
+++ b/alt-tab-macos/ui/Application.swift
@@ -47,7 +47,7 @@ class Application: NSApplication, NSApplicationDelegate, NSWindowDelegate {
 
     func hideUi() {
         debugPrint("hideUi")
-        thumbnailsPanel!.orderOut(nil)
+        DispatchQueue.main.async(execute: { self.thumbnailsPanel!.orderOut(nil) })
         appIsBeingUsed = false
         isFirstSummon = true
     }
@@ -96,7 +96,7 @@ class Application: NSApplication, NSApplicationDelegate, NSWindowDelegate {
 
     func cycleSelection(_ step: Int) {
         selectedOpenWindow = cellWithStep(step)
-        thumbnailsPanel!.highlightCellAt(step)
+        DispatchQueue.main.async(execute: { self.thumbnailsPanel!.highlightCellAt(step) })
     }
 
     func showUiOrCycleSelection(_ step: Int) {
@@ -117,7 +117,6 @@ class Application: NSApplication, NSApplicationDelegate, NSWindowDelegate {
             }
             workItems.append(workItem)
             DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Preferences.windowDisplayDelay!, execute: workItem)
-
         } else {
             cycleSelection(step)
         }