diff --git a/owl/templates/edit-post.html b/owl/templates/edit-post.html
index 9d2641844b4ff664c6f5ee29b442787ea17cace7..664bfbc71d5341c8874b1132d06dbddaaf09a7cc 100644
--- a/owl/templates/edit-post.html
+++ b/owl/templates/edit-post.html
@@ -19,7 +19,10 @@
 		{% endif %}
 		<p>{{ form.comment(rows=16, cols=80) }}
 		{% if g.is_grader %}
-			<p>{{ form.points.label }} {{ form.points(size=6) }} / {{ g.topic.max_points or "?" }}
+			<p>{{ form.points.label }} {{ form.points(size=6) }}
+			{% if g.topic.max_points %}
+				/ <button id=maxbutton type=button accesskey='m' onclick="javascript:document.getElementById('points').value = document.getElementById('maxbutton').innerText">{{ g.topic.max_points }}</button>
+			{% endif %}
 			{% if form.errors['points'] %}
 				<p class=error>{{ form.errors['points'][0] }}
 			{% endif %}