Changed to only apply for specific commands instead of for every cursor movement