Cancel and delete comment can result in a stuck comment window

[benloh]

1. Add a new comment
2. Click to start typing
3. Click "Cancel" to cancel the comment
4. Click "Delete" to delete the comment.
5. Window is left open -- Close button is disabled.

[benloh]

Should be fixed with 623021c

[benloh]

Confirm fixed.