Reimplement Alt+W for "Add Watch" (related to issue 6746)