Easy to lose comments

I keep losing comments by clicking outside the modal. It seems too easy to do. Worse, when it does get dismissed, the comment box is empty when clicking on reply again. I'd rather the modal close only with an X or for the state of the comment field to be retained when I open it again.