'Esc to cancel/commit text' alert keeps reappearing

I've only recently upgraded to CC and am finding using the Esc key to cancel text somewhat annoying.

On the first time I hit escape while editing text it gave me a choice to set esc as cancel or commit changes - being used to CS6 I want cancel. This seems to work fine, but it doesn't seem to remember what I chose between sessions, and sometimes will pop up multiple times per session.

Is there anything I can do to stop it popping up this alert?

Thanks