diff --git a/front/client/components/ConfirmDialog.vue b/front/client/components/ConfirmDialog.vue
index 2a1094a..fd3ddbe 100644
--- a/front/client/components/ConfirmDialog.vue
+++ b/front/client/components/ConfirmDialog.vue
@@ -1,4 +1,3 @@
-<!-- Universal confirmation dialog, just pass text and function in Props -->
 <template>
   <v-dialog
     :value="value"
@@ -6,6 +5,8 @@
     max-width="500px"
     v-bind="$attrs"
     @input="cancel"
+    @keydown.esc.stop="cancel"
+    @keydown.enter.stop=""
   >
 
     <template
@@ -74,6 +75,13 @@ export default class ConfirmDialog extends Vue {
   @Prop(Object) confirmBtnProps!: object
   @Prop(Object) cancelBtnProps!: object
 
+  test (event: Event) {
+    event.stopPropagation()
+    event.stopImmediatePropagation()
+    event.preventDefault()
+    console.log('ENTER FOCKIN CAPTURED')
+  }
+
   close () {
     this.$emit('input', false)
   }
diff --git a/front/client/components/MarkdownEditor.vue b/front/client/components/MarkdownEditor.vue
index a243e26..5b9f467 100644
--- a/front/client/components/MarkdownEditor.vue
+++ b/front/client/components/MarkdownEditor.vue
@@ -7,7 +7,7 @@
       'markdown-editor_has-bottom-toolbar': bottomToolbar,
       'markdown-editor_has-top-toolbar': toolbar
     }"
-    @keydown.exact.capture.enter="onEnterDown"
+    @keydown.exact.enter="onEnterDown"
     @keydown.exact.ctrl.enter="onCtrlEnterDown"
     @keydown.exact.meta.enter="onCtrlEnterDown"
     @keydown.exact.esc="onEsc"
@@ -240,7 +240,9 @@ export default class MarkdownEditor extends Vue {
     }
     if (isConfirmed) {
       this.cancel()
+      return
     }
+    this.focusInputArea()
   }
 
   cancel () {