diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index ab3230e97..35c6205ae 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -43,35 +43,12 @@
         />
       </div>
       <div v-else>
-        <content-viewer
-          v-if="$filters.removeHtml(comment.content).length < 180"
-          :content="comment.content"
-          class="padding-left"
-        />
-        <div v-else class="show-more-or-less-div">
-          <content-viewer
-            v-if="isCollapsed"
-            :content="$filters.truncate(comment.content, 180)"
-            class="padding-left text-align-left"
-          />
-          <span class="show-more-or-less">
-            <a v-if="isCollapsed" class="padding-left" @click="isCollapsed = !isCollapsed">
-              {{ $t('comment.show.more') }}
-            </a>
-          </span>
-        </div>
-        <content-viewer
-          v-if="!isCollapsed"
-          :content="comment.content"
-          class="padding-left text-align-left"
-        />
-        <div class="show-more-or-less-div">
-          <span class="show-more-or-less">
-            <a v-if="!isCollapsed" class="padding-left" @click="isCollapsed = !isCollapsed">
-              {{ $t('comment.show.less') }}
-            </a>
-          </span>
-        </div>
+        <content-viewer :content="commentContent" class="padding-left text-align-left" />
+        <span v-if="isLongComment" class="show-more-or-less">
+          <a class="padding-left" @click="isCollapsed = !isCollapsed">
+            {{ isCollapsed ? $t('comment.show.more') : $t('comment.show.less') }}
+          </a>
+        </span>
       </div>
       <ds-space margin-bottom="small" />
     </ds-card>
@@ -119,6 +96,16 @@ export default {
     isTarget() {
       return this.$route.hash === `#${this.anchor}`
     },
+    isLongComment() {
+      return this.$filters.removeHtml(this.comment.content).length > 180
+    },
+    commentContent() {
+      if (this.isLongComment && this.isCollapsed) {
+        return this.$filters.truncate(this.comment.content, 180)
+      }
+
+      return this.comment.content
+    },
     anchor() {
       return `commentId-${this.comment.id}`
     },
diff --git a/webapp/components/Editor/ContentViewer.vue b/webapp/components/Editor/ContentViewer.vue
index ab07d11d6..b9a167df7 100644
--- a/webapp/components/Editor/ContentViewer.vue
+++ b/webapp/components/Editor/ContentViewer.vue
@@ -1,5 +1,5 @@
 <template>
-  <editor-content :editor="editor" />
+  <editor-content :editor="editor" :key="content" />
 </template>
 
 <script>
@@ -31,6 +31,9 @@ export default {
       }),
     }
   },
+  beforeUpdate() {
+    this.editor.setContent(this.content)
+  },
   beforeDestroy() {
     this.editor.destroy()
   },