diff --git a/cypress/integration/discussions.js b/cypress/integration/discussions.js
index 46b3f52cb9..3c055d1923 100644
--- a/cypress/integration/discussions.js
+++ b/cypress/integration/discussions.js
@@ -26,7 +26,7 @@ context('Discussions', () => {
 
 		// Submit
 		cy.get('.modal .submit-discussion').click();
-		cy.wait(20000);
+		cy.wait(2000);
 
 		// Check if discussion is added to page and content is visible
 		cy.get('.sidebar-parent:first .discussion-topic-title').should('have.text', 'Discussion from tests');
diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js
index 952d813469..b09f1300c2 100644
--- a/frappe/templates/discussions/discussions.js
+++ b/frappe/templates/discussions/discussions.js
@@ -113,8 +113,9 @@ var publish_message = (data) => {
 };
 
 var post_message_cleanup = () => {
+	$(".topic-title").val("");
 	$(".comment-field").val("");
-	$(".comment-field").css("height", "48px");
+	$(".discussion-on-page .comment-field").css("height", "48px");
 	$("#discussion-modal").modal("hide");
 	$("#no-discussions").addClass("hide");
 	$(".cancel-comment").addClass("hide");
diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py
index c5d3851068..95267e1e15 100644
--- a/frappe/tests/ui_test_helpers.py
+++ b/frappe/tests/ui_test_helpers.py
@@ -194,6 +194,10 @@ def create_form_tour():
 
 @frappe.whitelist()
 def create_data_for_discussions():
+	web_page = create_web_page()
+	create_topic_and_reply(web_page)
+
+def create_web_page():
 	web_page = frappe.db.exists("Web Page", {"route": "test-page-discussions"})
 	if not web_page:
 		web_page = frappe.get_doc({
@@ -212,6 +216,36 @@ def create_data_for_discussions():
 									})
 		})
 		web_page.save()
+	return web_page
+
+def create_topic_and_reply(web_page):
+	topic = frappe.db.exists("Discussion Topic",
+				{
+					"reference_doctype": "Web Page",
+					"reference_docname": web_page.name
+				}
+			)
+
+	if not topic:
+		topic = frappe.get_doc({
+					"doctype": "Discussion Topic",
+					"reference_doctype": "Web Page",
+					"reference_docname": web_page.name,
+					"title": "Test Topic"
+				})
+
+		topic.save()
+
+		reply = frappe.get_doc({
+					"doctype": "Discussion Reply",
+					"topic": topic.name,
+					"reply": "This is a test reply"
+				})
+
+		reply.save()
+
+
+