Fix ^W behavior