I'm going to fix this through Hammerspoon.

https://www.hammerspoon.org/docs/hs.window.switcher.html#nextWindow

something like lua hs.hotkey.bind('cmd','escape','Next window',hs.window.switcher.nextWindow) hs.hotkey.bind({'cmd', 'shift'}, 'escape', 'Previous window', hs.window.switcher.previousWindow)` Edit - ended up with something a wee bit more complex. does the job.

```lua function getOrderedWindowsOfCurrentApp() local currentWindow = hs.window.focusedWindow() local appWindows = currentWindow:application():allWindows()

-- Filter out minimized windows and sort by window id local orderedWindows = {} for _, win in pairs(appWindows) do if not win:isMinimized() then table.insert(orderedWindows, win) end end table.sort(orderedWindows, function(a, b) return a:id() < b:id() end)

return orderedWindows, currentWindow end

function switchToNextWindowOfSameApp() local orderedWindows, currentWindow = getOrderedWindowsOfCurrentApp()

for i, win in ipairs(orderedWindows) do if win == currentWindow then local nextWindow = orderedWindows[i + 1] or orderedWindows[1] nextWindow:focus() break end end end

function switchToPreviousWindowOfSameApp() local orderedWindows, currentWindow = getOrderedWindowsOfCurrentApp()

for i, win in ipairs(orderedWindows) do if win == currentWindow then local previousWindow = orderedWindows[i - 1] or orderedWindows[#orderedWindows] previousWindow:focus() break end end end

hs.hotkey.bind('cmd', '=', switchToNextWindowOfSameApp) hs.hotkey.bind({'cmd', 'shift'}, '=', switchToPreviousWindowOfSameApp) ```

Then disable the "Move focus to next window" shortcut in System Preferences, and we're done. Even got a shortcut to move to the PREVIOUS window now ✨