Fix default command with rename window