diff --git a/grade/grading/form/guide/templates/comment_chooser.mustache b/grade/grading/form/guide/templates/comment_chooser.mustache
index 883121c38c6..1199a1e3cf9 100644
--- a/grade/grading/form/guide/templates/comment_chooser.mustache
+++ b/grade/grading/form/guide/templates/comment_chooser.mustache
@@ -47,13 +47,11 @@
     }
 }}
 <div class="gradingform_guide_comment_chooser" id="comment_chooser">
-    <ul role="list">
+    <div class="list-group">
         {{#comments}}
-            <li role="listitem">
-                <button id="comment-option-{{criterionId}}-{{id}}" class="btn btn-link" tabindex="0">
-                    {{description}}
-                </button>
-            </li>
+            <button class="list-group-item list-group-item-action" id="comment-option-{{criterionId}}-{{id}}" tabindex="0">
+                {{description}}
+            </button>
         {{/comments}}
-    </ul>
+    </div>
 </div>
diff --git a/theme/boost/templates/gradingform_guide/comment_chooser.mustache b/theme/bootstrapbase/templates/gradingform_guide/comment_chooser.mustache
similarity index 87%
rename from theme/boost/templates/gradingform_guide/comment_chooser.mustache
rename to theme/bootstrapbase/templates/gradingform_guide/comment_chooser.mustache
index 1199a1e3cf9..883121c38c6 100644
--- a/theme/boost/templates/gradingform_guide/comment_chooser.mustache
+++ b/theme/bootstrapbase/templates/gradingform_guide/comment_chooser.mustache
@@ -47,11 +47,13 @@
     }
 }}
 <div class="gradingform_guide_comment_chooser" id="comment_chooser">
-    <div class="list-group">
+    <ul role="list">
         {{#comments}}
-            <button class="list-group-item list-group-item-action" id="comment-option-{{criterionId}}-{{id}}" tabindex="0">
-                {{description}}
-            </button>
+            <li role="listitem">
+                <button id="comment-option-{{criterionId}}-{{id}}" class="btn btn-link" tabindex="0">
+                    {{description}}
+                </button>
+            </li>
         {{/comments}}
-    </div>
+    </ul>
 </div>