diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js
index 30b5337e4..7ce72287e 100644
--- a/files/assets/js/comments_v.js
+++ b/files/assets/js/comments_v.js
@@ -178,6 +178,7 @@ function comment_edit(id){
 			document.getElementById('cancel-edit-'+id).click()
 			bs_trigger(commentForm);
 			document.getElementById('filename-edit-reply-' + id).innerHTML = '<i class="fas fa-file"></i>';
+			document.getElementById('comment-edit-body-' + id).value = data["body"];
 		}
 		else {
 			showToast(false, getMessageFromJsonData(false, data));
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 17374a3b7..f96fdd65c 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -462,7 +462,7 @@ def edit_comment(cid, v):
 				g.db.add(n)
 
 	g.db.commit()
-	return {"comment": c.realbody(v)}
+	return {"body": body, "comment": c.realbody(v)}
 
 
 @app.post("/delete/comment/<cid>")