diff --git a/mod/assign/styles.css b/mod/assign/styles.css
index aa3c880382d..16bca8b1bd4 100644
--- a/mod/assign/styles.css
+++ b/mod/assign/styles.css
@@ -150,3 +150,13 @@ td.submissioneditable {
 .hidefull {
     display: none;
 }
+
+.quickgradingform form .commentscontainer input,
+.quickgradingform form .commentscontainer textarea {
+    display: none;
+}
+
+.jsenabled .quickgradingform form .commentscontainer input,
+.jsenabled .quickgradingform form .commentscontainer textarea {
+    display: inline;
+}
diff --git a/mod/assign/submission/comments/locallib.php b/mod/assign/submission/comments/locallib.php
index 33f97bec75d..6922ab3dcca 100644
--- a/mod/assign/submission/comments/locallib.php
+++ b/mod/assign/submission/comments/locallib.php
@@ -71,7 +71,8 @@ class assign_submission_comments extends assign_submission_plugin {
         $comment = new comment($options);
         $comment->set_view_permission(true);
 
-        return $comment->output(true);
+        $o = $this->assignment->get_renderer()->container($comment->output(true), 'commentscontainer');
+        return $o;
     }
 
     /**