CMD+W on mac client has different behavior than the X button

The X button on the window should call the exact same function as CMD+W. Time and time again I accidentally quit during champ select because I have the wrong window focused and i press CMD+W. Something this simple should be fixed by now...

Just remember, X and CMD+W are synonymous on mac.