Fix for Ctrl-click / Cmd-click