Fixed Quit Options key selection bug
Fixing merge conflict, and I smell