Shortcut selectors fix for reset by timeout