diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index 3da39f435..46163bed0 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -56,7 +56,7 @@
       <ds-space margin-bottom="small" />
     </ds-card>
     <ds-button
-      v-bind:title="antworten"
+      v-bind:title="answered"
       icon="level-down"
       style="float:right; top: -22px;"
       @click.prevent="answerComment"
@@ -86,6 +86,7 @@ export default {
       isTarget,
       isCollapsed: !isTarget,
       openEditCommentMenu: false,
+      answered: this.$t('post.comment.answered'),
     }
   },
   components: {
@@ -176,19 +177,20 @@ export default {
       }
     },
     answerComment() {
+      const slug =
+        '<a class="mention" href="/profile/' +
+        this.comment.author.id +
+        '" data-mention-id="' +
+        this.comment.author.slug +
+        '" target="_blank" contenteditable="false">@d' +
+        this.comment.author.slug +
+        '</a>'
+      document.querySelector('.editor-content div').focus()
       if (document.querySelector('.is-empty')) {
-        document.querySelector('.is-empty').innerHTML = '@' + this.comment.author.slug
+          document.querySelector('.is-empty').innerHTML =  slug + ' '
       } else {
-        const html = document.querySelector('.editor-content').innerHTML
-        const slug =
-          '<a class="mention" href="/profile/' +
-          this.comment.author.id +
-          '" data-mention-id="' +
-          this.comment.author.slug +
-          '" target="_blank" contenteditable="false">@d' +
-          this.comment.author.slug +
-          '</a>'
-        document.querySelector('.editor-content').innerHTML = html + '' + slug
+          const html = document.querySelector('.editor-content').innerHTML
+          document.querySelector('.editor-content div').innerHTML = html + ' ' +  slug + ' '
       }
     },
   },
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 880d22c87..060892d03 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -269,7 +269,8 @@
         "comment": {
             "submit": "Kommentiere",
             "submitted": "Kommentar Gesendet",
-            "updated": "Änderungen gespeichert"
+            "updated": "Änderungen gespeichert",
+            "answered": "answered"
         },
         "edited": "bearbeitet"
     },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 94183d7e7..69215d484 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -423,7 +423,8 @@
     "comment": {
       "submit": "Comment",
       "submitted": "Comment Submitted",
-      "updated": "Changes Saved"
+      "updated": "Changes Saved",
+      "answered": "answered"
     },
     "edited": "edited"
   },