diff --git a/frontend/src/components/submission_notes/SubmissionCorrection.vue b/frontend/src/components/submission_notes/SubmissionCorrection.vue
index 485c6adbbbf6743da83db971d0bf946e8a6439bf..8cb61c0dd5059e6b3bd44546b2d7cf0373de4a19 100644
--- a/frontend/src/components/submission_notes/SubmissionCorrection.vue
+++ b/frontend/src/components/submission_notes/SubmissionCorrection.vue
@@ -48,6 +48,7 @@
         :loading="loading"
         :fullScore="submissionObj['full_score']"
         :skippable="assignment !== undefined"
+        :feedback="feedbackObj ? feedbackObj : {}"
         @submitFeedback="submitFeedback"
         @skip="$emit('skip')"
       />
diff --git a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
index 4d0d5bff72fee2c521ff5d2c6b9eccbd46917c59..835ec918aa6802346c5f3990c6f2b8872d63318d 100644
--- a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+++ b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
@@ -61,8 +61,11 @@
     data () {
       return {
         scoreError: '',
+        initialIsFinal: this.$store.state.submissionNotes.origFeedback.isFinal ||
+          !this.$store.getters['submissionNotes/isFeedbackCreation'] || this.$store.getters.isReviewer,
         isFinal: this.$store.state.submissionNotes.origFeedback.isFinal ||
           !this.$store.getters['submissionNotes/isFeedbackCreation'] || this.$store.getters.isReviewer
+
       }
     },
     props: {
@@ -77,6 +80,10 @@
       skippable: {
         type: Boolean,
         default: false
+      },
+      feedback: {
+        type: Object,
+        default: () => {}
       }
     },
     computed: {
@@ -92,6 +99,18 @@
         return !this.$store.getters['submissionNotes/isFeedbackCreation'] || this.$store.getters.isReviewer
       }
     },
+    watch: {
+      feedback: {
+        handler: function (val) {
+          if (!val.hasOwnProperty('is_final')) {
+            this.isFinal = this.initialValue
+          } else {
+            this.isFinal = val.is_final
+          }
+        },
+        deep: true
+      }
+    },
     methods: {
       emitScoreError (error, duration) {
         this.scoreError = error
@@ -111,6 +130,7 @@
       },
       submit () {
         this.$emit('submitFeedback', {isFinal: this.isFinal})
+        this.isFinal = this.initialIsFinal
       }
     }
   }