diff --git a/app/javascript/vue/shared/inline_edit.vue b/app/javascript/vue/shared/inline_edit.vue
index b49a79a61..b89de6436 100644
--- a/app/javascript/vue/shared/inline_edit.vue
+++ b/app/javascript/vue/shared/inline_edit.vue
@@ -14,7 +14,7 @@
         v-model="newValue"
         @keydown="handleKeypress"
         @blur="handleBlur"
-        @keyup.escape="cancelEdit"
+        @keyup.escape="cancelEdit && this.atWhoOpened"
         @focus="setCaretAtEnd"/>
       <textarea v-else
         ref="input"
@@ -28,7 +28,7 @@
         v-model="newValue"
         @keydown="handleKeypress"
         @blur="handleBlur"
-        @keyup.escape="cancelEdit"
+        @keyup.escape="cancelEdit && this.atWhoOpened"
         @focus="setCaretAtEnd"/>
     </template>
     <div
@@ -240,6 +240,9 @@
         sel.collapse(sel.anchorNode, offset);
       },
       handleKeypress(e) {
+        this.atWhoOpened = $('.atwho-view:visible').length > 0
+        if (this.atWhoOpened) return;
+
         if (e.key == 'Escape') {
           this.cancelEdit();
         } else if (e.key == 'Enter' && this.saveOnEnter && e.shiftKey == false) {