diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 032f457d..8fb7cf5e 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -58,23 +58,7 @@
 <div>
 
     {% if view_feedback %}
-    Notes:
-    <ul class="notes">
-        {% for note in question.notes.all %}
-        <li {% if note.complete %}class='complete' {% endif %}>
-            {{ note.created_on }} by
-            {% if note.user_author %}
-            {{note.user_author}}
-            {% else %}
-            {{ note.author }} [unregistered]
-            {% endif %}
-            {{note.note_type}} / {{ note.note }}
-            {% if not note.complete %}
-            (<a href="{% url 'feedback_mark_complete' pk=note.pk %}">Mark complete</a>)
-            {% endif %}
-        </li>
-        {% endfor %}
-    </ul>
+    {% include 'question_notes.html' %}
     <details>
         <summary>
             Suggested answers
diff --git a/templates/question_notes.html b/templates/question_notes.html
new file mode 100644
index 00000000..016e99a0
--- /dev/null
+++ b/templates/question_notes.html
@@ -0,0 +1,17 @@
+Notes:
+<ul class="notes">
+    {% for note in question.notes.all %}
+    <li {% if note.complete %}class='complete' {% endif %}>
+        {{ note.created_on }} by
+        {% if note.user_author %}
+        {{note.user_author}}
+        {% else %}
+        {{ note.author }} [unregistered]
+        {% endif %}
+        {{note.note_type}} / {{ note.note }}
+        {% if not note.complete %}
+        (<a href="{% url 'feedback_mark_complete' pk=note.pk %}">Mark complete</a>)
+        {% endif %}
+    </li>
+    {% endfor %}
+</ul>
\ No newline at end of file