HotKey improvment