diff --git a/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx b/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx index 4ff41f2058dd..5cc24d3fc00d 100644 --- a/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx +++ b/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx @@ -437,8 +437,13 @@ export const CalendarPicker = React.forwardRef(function CalendarPicker( }, ); + const prevOpenViewRef = React.useRef(openView); React.useEffect(() => { // Set focus to the button when switching from a view to another + if (prevOpenViewRef.current === openView) { + return; + } + prevOpenViewRef.current = openView; handleFocusedViewChange(openView)(true); }, [openView, handleFocusedViewChange]);