diff --git a/client/coral-embed-stream/src/EditableCommentContent.js b/client/coral-embed-stream/src/EditableCommentContent.js
index 6ac223844..0b9dda93a 100644
--- a/client/coral-embed-stream/src/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/EditableCommentContent.js
@@ -97,9 +97,6 @@ export class EditableCommentContent extends React.Component {
       stopEditing();
     }
   }
-  stopEditing() {
-    this.setState({resetCounter: this.state.resetCounter + 1});
-  }
   render() {
     const originalBody = this.props.comment.body;
     const editableUntil = getEditableUntilDate(this.props.comment);
@@ -121,6 +118,7 @@ export class EditableCommentContent extends React.Component {
           bodyPlaceholder=""
           submitText={'Save changes' /* @TODO (bengo) i18n */}
           saveButtonCStyle="green"
+          cancelButtonClicked={this.props.stopEditing}
         />
         {
           editWindowExpired