diff --git a/app/javascript/vue/shared/inline_edit.vue b/app/javascript/vue/shared/inline_edit.vue
index 12eb4a610..81a2c19cc 100644
--- a/app/javascript/vue/shared/inline_edit.vue
+++ b/app/javascript/vue/shared/inline_edit.vue
@@ -13,7 +13,7 @@
         @blur="handleBlur"
         @keyup.escape="cancelEdit"
       ></textarea>
-      <div v-else @click="enableEdit($event)" class="sci-inline-edit__view" v-html="(smartAnnotation ? sa_value : value) || placeholder" :class="{ 'blank': isBlank }"></div>
+      <div v-else @click="enableEdit($event)" class="sci-inline-edit__view" v-html="(smartAnnotation ? sa_value : newValue) || placeholder" :class="{ 'blank': isBlank }"></div>
       <div v-if="editing && error" class="sci-inline-edit__error">
         {{ error }}
       </div>
@@ -22,7 +22,7 @@
       <div :class="{ 'btn-primary': !error, 'btn-disabled': error }" class="sci-inline-edit__control btn icon-btn" @click="update">
         <i class="fas fa-check"></i>
       </div>
-      <div class="sci-inline-edit__control btn btn-light icon-btn" @click="cancelEdit">
+      <div class="sci-inline-edit__control btn btn-light icon-btn" @mousedown="cancelEdit">
         <i class="fas fa-times"></i>
       </div>
     </template>
@@ -182,15 +182,13 @@
           return;
         }
 
-        setTimeout(() => {
-          if(this.error) return;
-          if(!this.$refs.input) return;
-          this.newValue = this.$refs.input.value // Fix for smart annotation
-          this.newValue = this.newValue.trim();
-          this.editing = false;
-          this.$emit('editingDisabled');
-          this.$emit('update', this.newValue);
-        }, 100) // due to clicking 'x' also triggering a blur event
+        if(this.error) return;
+        if(!this.$refs.input) return;
+        this.newValue = this.$refs.input.value // Fix for smart annotation
+        this.newValue = this.newValue.trim();
+        this.editing = false;
+        this.$emit('editingDisabled');
+        this.$emit('update', this.newValue);
       }
     }
   }