diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index 51ae06b26a..aed1a45b6d 100755
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -2245,7 +2245,9 @@ export default {
                         }
                     }
                     else if (event.keyCode === 9) {
-                        DomHandler.getFocusableElements($vm.$refs.overlay).forEach(el => el.tabIndex = '-1');
+                        if($vm.showOnFocus){
+                            DomHandler.getFocusableElements($vm.$refs.overlay).forEach(el => el.tabIndex = '-1');
+                        }
                         if ($vm.overlayVisible) {
                             $vm.overlayVisible = false;
                         }