diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue index f56a1b848..e9e963b96 100755 --- a/src/components/calendar/Calendar.vue +++ b/src/components/calendar/Calendar.vue @@ -1987,7 +1987,10 @@ export default { } } else if (event.keyCode === 9) { - DomHandler.getFocusableElements(this.overlay).forEach(el => el.tabIndex = '-1'); + if (this.overlay) { + DomHandler.getFocusableElements(this.overlay).forEach(el => el.tabIndex = '-1'); + } + if (this.overlayVisible) { this.overlayVisible = false; }