diff --git a/resources/vue/components/BlubberThread.vue b/resources/vue/components/BlubberThread.vue
index f07e2e43b248713d8fd455997e0576b3a32ddd73..ce84d9647e92a0c06cc5d9f18e7da4c924fb9e20 100644
--- a/resources/vue/components/BlubberThread.vue
+++ b/resources/vue/components/BlubberThread.vue
@@ -47,12 +47,12 @@
                             <div v-html="comment.html" class="html"></div>
                             <textarea class="edit"
                                       v-html="comment.content"
-                                      @keyup.enter.exact="saveComment"
+                                      @keydown.enter.exact="saveComment"
                                       @keyup.escape.exact="editComment"></textarea>
                         </div>
                         <div class="time">
                             <studip-date-time :timestamp="comment.mkdate" :relative="true"></studip-date-time>
-                            <a href="" v-if="comment.writable" @click.prevent="editComment" class="edit_comment" :title="$gettext('Bearbeiten.')">
+                            <a href="" v-if="comment.writable" @click.prevent.stop="editComment" class="edit_comment" :title="$gettext('Bearbeiten.')">
                                 <studip-icon shape="edit" size="14" role="inactive"></studip-icon>
                             </a>
                             <a href="" @click.prevent="answerComment" class="answer_comment" :title="$gettext('Hierauf antworten.')">