diff --git a/app/src/controllers/MyModalP.vue b/app/src/controllers/MyModalP.vue
index 44f01923..d9306e12 100644
--- a/app/src/controllers/MyModalP.vue
+++ b/app/src/controllers/MyModalP.vue
@@ -9,7 +9,7 @@
         </div>
         <div slot="footer">
             <button type="button" class="btn btn-default" @click="cancel">{{"Annuler"}}</button>
-            <button type="button" class="btn btn-primary" @click="ok">{{"Confirmer"}}</button>
+            <button type="button" class="btn btn-primary" @click="ok" v-auto-focus>{{"Confirmer"}}</button>
         </div>
     </modal>
 </template>
diff --git a/app/src/directives/Modal.vue b/app/src/directives/Modal.vue
index d8cb2a67..cf791e73 100644
--- a/app/src/directives/Modal.vue
+++ b/app/src/directives/Modal.vue
@@ -1,6 +1,6 @@
 <template> 
 <transition name="modal">
- <div class="modal modal-mask" style="display: block" @click="$emit('cancel')">
+ <div class="modal modal-mask" style="display: block" @click="$emit('cancel')" @keydown.esc="$emit('cancel')">
   <div class="modal-dialog" role="document" @click.stop="">
     <div class="modal-content panel-warning">
       <div class="modal-header panel-heading">