diff --git a/lib/commentlib.php b/lib/commentlib.php
index 1383163c600..7aceb958896 100644
--- a/lib/commentlib.php
+++ b/lib/commentlib.php
@@ -313,7 +313,8 @@ EOD;
                 $html .= <<<EOD
 <div class='comment-area'>
     <div class="bd">
-        <form method="POST" id="comment-form-{$this->cid}" action="{$CFG->wwwroot}/comment/comment_post.php">
+        <form method="post" id="comment-form-{$this->cid}" action="{$CFG->wwwroot}/comment/comment_post.php">
+        <div>
         <textarea name="content" rows="1" id="dlg-content-{$this->cid}"></textarea>
         <input type="hidden" name="contextid" value="$this->contextid" />
         <input type="hidden" name="action" value="add" />
@@ -322,6 +323,7 @@ EOD;
         <input type="hidden" name="courseid" value="{$this->course->id}" />
         <input type="hidden" name="sesskey" value="{$sesskey}" />
         <input type="hidden" name="client_id" value="$this->cid" />
+        </div>
         </form>
     </div>
     <div class="fd" id="comment-action-{$this->cid}">