Not sure if this is what you are after but you can use `cmd` + `~` to switch between windows of the same app.