diff --git a/packages/components/accordion/src/accordion-tree.tsx b/packages/components/accordion/src/accordion-tree.tsx
deleted file mode 100644
index 2ad0a46fa6..0000000000
--- a/packages/components/accordion/src/accordion-tree.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import {forwardRef, ReactNode} from "react";
-
-import AccordionItem, {AccordionItemProps} from "./accordion-item";
-import Accordion, {AccordionProps} from "./accordion";
-
-export interface AccordionTreeItemProps extends Omit<AccordionItemProps, "children"> {
-  contentMain?: ReactNode;
-  contentChildren?: AccordionTreeItemProps[];
-}
-
-export interface AccordionTreeProps extends Omit<AccordionProps, "children"> {
-  items: AccordionTreeItemProps[];
-}
-
-const AccordionTree = forwardRef<HTMLDivElement, AccordionTreeProps>((props, ref) => {
-  const {
-    items,
-    itemClasses: propsItemClasses,
-    className,
-    isCompact = true,
-    selectionMode = "multiple",
-    ...otherProps
-  } = props;
-
-  const itemClasses = {
-    ...propsItemClasses,
-    trigger: propsItemClasses?.trigger ?? "py-1",
-    base: propsItemClasses?.base ?? "py-0",
-  };
-
-  return (
-    <Accordion
-      ref={ref}
-      {...otherProps}
-      className={className}
-      isCompact={isCompact}
-      itemClasses={itemClasses}
-      selectionMode={selectionMode}
-    >
-      {items.map((item, index) => {
-        const {contentMain, contentChildren, ...itemProps} = item;
-
-        return (
-          <AccordionItem key={index} {...itemProps}>
-            {contentMain && contentMain}
-            {contentChildren && (
-              <AccordionTree
-                isCompact={isCompact}
-                itemClasses={itemClasses}
-                items={contentChildren}
-                selectionMode={selectionMode}
-              />
-            )}
-          </AccordionItem>
-        );
-      })}
-    </Accordion>
-  );
-});
-
-AccordionTree.displayName = "NextUI.AccordionTree";
-
-export default AccordionTree;
diff --git a/packages/components/calendar/src/calendar-header.tsx b/packages/components/calendar/src/calendar-header.tsx
index 7e04926dd1..9abc782aea 100644
--- a/packages/components/calendar/src/calendar-header.tsx
+++ b/packages/components/calendar/src/calendar-header.tsx
@@ -18,6 +18,8 @@ export interface CalendarHeaderProps extends HTMLNextUIProps<"header"> {
   buttonPickerProps?: ButtonProps;
 }
 
+export const monthAndYearPickerToggle = "Month and year picker toggle";
+
 export function CalendarHeader(props: CalendarHeaderProps) {
   const {direction, date, currentMonth, buttonPickerProps} = props;
 
@@ -99,6 +101,7 @@ export function CalendarHeader(props: CalendarHeaderProps) {
   return showMonthAndYearPickers ? (
     <Button
       {...headerProps}
+      aria-label={monthAndYearPickerToggle}
       disableAnimation={disableAnimation}
       endContent={<ChevronDownIcon className="chevron-icon" />}
       onKeyDown={handleKeyDown}
diff --git a/packages/components/date-picker/__tests__/date-picker.test.tsx b/packages/components/date-picker/__tests__/date-picker.test.tsx
index 8d95dd6346..dec00cf9b5 100644
--- a/packages/components/date-picker/__tests__/date-picker.test.tsx
+++ b/packages/components/date-picker/__tests__/date-picker.test.tsx
@@ -5,6 +5,7 @@ import {pointerMap, triggerPress} from "@nextui-org/test-utils";
 import userEvent from "@testing-library/user-event";
 import {CalendarDate, CalendarDateTime} from "@internationalized/date";
 import {NextUIProvider} from "@nextui-org/system";
+import {monthAndYearPickerToggle} from "@nextui-org/calendar/src/calendar-header";
 
 import {DatePicker as DatePickerBase, DatePickerProps} from "../src";
 
@@ -524,6 +525,7 @@ describe("DatePicker", () => {
 
   describe("Month and Year Picker", () => {
     const onHeaderExpandedChangeSpy = jest.fn();
+    const valueChangeSpy = jest.fn();
 
     afterEach(() => {
       onHeaderExpandedChangeSpy.mockClear();
@@ -600,6 +602,48 @@ describe("DatePicker", () => {
       expect(onHeaderExpandedChangeSpy).not.toHaveBeenCalled();
     });
 
+    it("should focus the month and year when pressed in the picker", () => {
+      const {getByRole, getByLabelText} = render(
+        <DatePicker
+          showMonthAndYearPickers
+          calendarProps={{
+            isHeaderExpanded: true,
+            onChange: valueChangeSpy,
+          }}
+          defaultValue={new CalendarDate(2024, 4, 26)}
+          label="Date"
+        />,
+      );
+      const dialogButton = getByRole("button");
+
+      triggerPress(dialogButton);
+
+      const dialog = getByRole("dialog");
+      const month = getByRole("button", {name: "April"});
+      const year = getByRole("button", {name: "2024"});
+
+      expect(dialog).toBeVisible();
+      expect(month).toHaveAttribute("data-value", "4");
+      expect(year).toHaveAttribute("data-value", "2024");
+
+      const button = getByLabelText(monthAndYearPickerToggle);
+
+      triggerPress(button);
+
+      const monthBefore = getByRole("button", {name: "March"});
+      const yearBefore = getByRole("button", {name: "2023"});
+
+      expect(monthBefore).toHaveAttribute("data-value", "3");
+      expect(yearBefore).toHaveAttribute("data-value", "2023");
+      expect(monthBefore).toHaveAttribute("tabindex", "-1");
+      expect(yearBefore).toHaveAttribute("tabindex", "-1");
+      triggerPress(monthBefore);
+      triggerPress(yearBefore);
+      expect(valueChangeSpy).not.toHaveBeenCalled();
+      expect(monthBefore).toHaveAttribute("tabindex", "0");
+      expect(yearBefore).toHaveAttribute("tabindex", "0");
+    });
+
     it("CalendarBottomContent should render correctly", () => {
       const {getByRole, getByTestId} = render(
         <DatePicker