diff --git a/alt-tab-macos/logic/Keyboard.swift b/alt-tab-macos/logic/Keyboard.swift
index 5d6d7508..8e06d1b1 100644
--- a/alt-tab-macos/logic/Keyboard.swift
+++ b/alt-tab-macos/logic/Keyboard.swift
@@ -50,10 +50,7 @@ func keyboardHandler(_ cgEvent: CGEvent, _ delegate: Application) -> Unmanaged<C
             let isLeftArrow = keycode == KeyCode.leftArrow
             let isEscape = keycode == KeyCode.escape
             if event.modifierFlags.contains(Preferences.metaModifierFlag!) {
-                if isMeta {
-                    delegate.preActivate()
-                    return nil // previously focused app should not receive keys
-                } else if keyDown {
+                if keyDown {
                     if isTab && event.modifierFlags.contains(.shift) {
                         delegate.showUiOrSelectPrevious()
                         return nil // previously focused app should not receive keys
diff --git a/alt-tab-macos/ui/Application.swift b/alt-tab-macos/ui/Application.swift
index 78da8e48..a45d70b1 100644
--- a/alt-tab-macos/ui/Application.swift
+++ b/alt-tab-macos/ui/Application.swift
@@ -35,12 +35,6 @@ class Application: NSApplication, NSApplicationDelegate, NSWindowDelegate {
         Screen.listenToChanges()
     }
 
-    func preActivate() {
-        debugPrint("preActivate")
-        computeOpenWindows()
-        selectedOpenWindow = 0
-    }
-
     func showUiOrSelectNext() {
         debugPrint("showUiOrSelectNext")
         showUiOrCycleSelection(1)
@@ -107,20 +101,25 @@ class Application: NSApplication, NSApplicationDelegate, NSWindowDelegate {
 
     func showUiOrCycleSelection(_ step: Int) {
         appIsBeingUsed = true
-        if openWindows.count > 0 {
-            if isFirstSummon {
-                isFirstSummon = false
-                let workItem = DispatchWorkItem {
-                    self.computeOpenWindows()
-                    self.thumbnailsPanel!.computeThumbnails()
-                    self.cycleSelection(step)
-                    self.showCenteredPanel(self.thumbnailsPanel!)
-                }
-                workItems.append(workItem)
-                DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Preferences.windowDisplayDelay!, execute: workItem)
-            } else {
-                self.cycleSelection(step)
+        if isFirstSummon {
+            isFirstSummon = false
+            selectedOpenWindow = 0
+            computeOpenWindows()
+            if openWindows.count <= 0 {
+                return
             }
+            selectedOpenWindow = cellWithStep(step)
+            var workItem: DispatchWorkItem!
+            workItem = DispatchWorkItem {
+                if !workItem.isCancelled { self.thumbnailsPanel!.computeThumbnails() }
+                if !workItem.isCancelled { self.thumbnailsPanel!.highlightCellAt(step) }
+                if !workItem.isCancelled { self.showCenteredPanel(self.thumbnailsPanel!) }
+            }
+            workItems.append(workItem)
+            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Preferences.windowDisplayDelay!, execute: workItem)
+
+        } else {
+            cycleSelection(step)
         }
     }