diff --git a/exercise/templates/exercise/exercise_plain.html b/exercise/templates/exercise/exercise_plain.html
index 9961a94c0..4a9a0528c 100644
--- a/exercise/templates/exercise/exercise_plain.html
+++ b/exercise/templates/exercise/exercise_plain.html
@@ -203,6 +203,9 @@
 					{% if disable_submit %}
 						data-aplus-disable-submit="true"
 					{% endif %}
+					{% if grader_feedback_just_received %}
+						data-aplus-grader-feedback-just-received="true"
+					{% endif %}
 				>
 					{% include "_messages.html" %}
 					{% include "exercise/_submit_progress.html" %}
diff --git a/exercise/views.py b/exercise/views.py
index 2ea529f41..4474ae20e 100644
--- a/exercise/views.py
+++ b/exercise/views.py
@@ -248,7 +248,11 @@ def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
                 return self.redirect(request.GET["__r"], backup=self.exercise);
 
         return self.render_to_response(self.get_context_data(
-            page=page, students=students, submission=new_submission))
+            page=page,
+            students=students,
+            submission=new_submission,
+            grader_feedback_just_received=True,
+        ))
 
     def submission_check(self, request=None):
         if self.exercise.grading_mode == BaseExercise.GRADING_MODE.LAST: