diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue
index 9b492efdcb11421741b50d774754c2c6ad7a94f3..8e2c343de97bc3eaa2314c3b3bb460f5bc55ee7f 100644
--- a/app/assets/javascripts/notes/components/note_body.vue
+++ b/app/assets/javascripts/notes/components/note_body.vue
@@ -108,11 +108,15 @@ export default {
       return escape(suggestion);
     },
   },
-  mounted() {
-    this.renderGFM();
-  },
-  updated() {
-    this.renderGFM();
+  watch: {
+    note: {
+      async handler() {
+        await this.$nextTick();
+        this.renderGFM();
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
     ...mapActions([