diff --git a/packages/primevue/src/datepicker/DatePicker.vue b/packages/primevue/src/datepicker/DatePicker.vue
index 8e0310afa..551a1ca69 100755
--- a/packages/primevue/src/datepicker/DatePicker.vue
+++ b/packages/primevue/src/datepicker/DatePicker.vue
@@ -2555,6 +2555,9 @@ export default {
                                     if (focusableElements[i].tagName === 'SPAN') {
                                         spanIndex = i;
                                         break;
+                                    } else if (focusableElements[i].tagName === 'BUTTON') {
+                                        spanIndex = i;
+                                        break;
                                     }
                                 }