fixed up random modal shortcuts/nav/click-next

worse UX, but more robust and works 100%