I am using a Swedish keyboard and did this to fix the issue. Should work on other non-US keyboards, too!
There IS a shortcut to switch between windows, however - the assigned shortcut did not work, so I decided to change the shortcut instead. Believe me, it is easier than it sounds 😀 This is how it goes:
- Open "System Preferences" (the grey icon) from the program menu on the bottom of your screen -> click "View all" -> Keyboard
- Open Shortcuts-tab once the Keyboard is open. You should be presented with a list of shortcuts.
- Click on the "Keyboard" again on the left side of the window (Mac tends to open "Mission Control" as a default)
- You should see another list of shortcuts. Choose "Move focus to another Window" from that list and click on the assigned shortcut of that line in the end - it will allow you to type now
- Type in your preferred shortcut. My recommendation: just retype the one there is and do that by holding down your Apple (CMD) button and clicking ~ tilde (the key above tab key on your keyboard, has a paragraph symbol on it in the Swedish keyboard - it's left from the 1 key on your keyboard). You should now see ⌘ˇ there, just as before - but this time it'll actually work!).
- You can close the system preferences and try it out
Now you have a situation where you can hold down the CMD/Apple key and click tab to switch between programs, and you can also switch between active windows within a program just by clicking CMD and the "paragraph" key just above the tab-key).
Alternatively, you can choose a shortcut that works for you - I find it faster to work with if switching between programs and switching within programs are close together on my keyboard (tab and ~ are on top of each other).
Hope it solves the issue for at least some of you 🙂