Make hover shortcuts much more robust