diff --git a/app/webroot/js/comanage/components/datepicker/cm-timepicker.js b/app/webroot/js/comanage/components/datepicker/cm-timepicker.js
index 9d3e6e614..d5fdcbc9a 100644
--- a/app/webroot/js/comanage/components/datepicker/cm-timepicker.js
+++ b/app/webroot/js/comanage/components/datepicker/cm-timepicker.js
@@ -43,8 +43,11 @@ export default {
       this.$emit('hide');
     }
   },
+  mounted() {
+    this.$refs.timepicker.focus();
+  },
   template: `
-    <div class="cm-time-picker-panel" v-clickout="hide">
+    <div class="cm-time-picker-panel" ref="timepicker" v-clickout="hide" @keydown.esc="hide" tabindex="-1">
       <div class="cm-time-picker-hours">
         <div class="cm-time-picker-title">{{ txt.hour }}</div>
         <div class="cm-time-picker-vals">