Hotkeys improvement