Revert "Remove cancel button and fix focussing bug."
Merge pull request #1806 from opf/revert-1803-fix/user-comment-remove-cancel-button

Revert "Remove cancel button and fix focussing bug."