diff --git a/apps/comments-ui/src/components/Form.js b/apps/comments-ui/src/components/Form.js
index 6b94e45c17..b3d65c263c 100644
--- a/apps/comments-ui/src/components/Form.js
+++ b/apps/comments-ui/src/components/Form.js
@@ -130,6 +130,9 @@ const Form = (props) => {
                 // Clear message and blur on success
                 editor.chain().clearContent().blur().run();
                 props.toggle();
+
+                setFormOpen(false);
+                props.toggleReplyMode();
             } catch (e) {
                 // eslint-disable-next-line no-console
                 console.error(e);