I can't set 'cmd + W' as a keyboard shortcut, as this closes the app without saving the new shortcut. Also the "Close Window" action doesn't seem to work. It looks like it triggers an incorrect shortcut (not cmd + W)