Enable/disable key controls much more nicely