diff --git a/src/test/year_picker_test.test.tsx b/src/test/year_picker_test.test.tsx
index 6721abcd2..a28006468 100644
--- a/src/test/year_picker_test.test.tsx
+++ b/src/test/year_picker_test.test.tsx
@@ -910,6 +910,34 @@ describe("YearPicker", () => {
       expect(selectedDay ? getYear(selectedDay) : selectedDay).toBe(2021);
     });
 
+    it("should select 2021 when Enter key is pressed (in Inline Mode)", () => {
+      const onDayClickMock = jest.fn();
+      const { container } = render(
+        <DatePicker
+          selected={null}
+          onChange={() => {}}
+          onSelect={onDayClickMock}
+          showYearPicker
+        />,
+      );
+      openDateInput(container);
+
+      const currentYear = container.querySelector(
+        ".react-datepicker__year-text--today",
+      ) as HTMLElement;
+      fireEvent.keyDown(currentYear, getKey(KeyType.Enter));
+
+      expect(onDayClickMock).toHaveBeenCalledTimes(1);
+      const expectedSelectedDate = getStartOfYear(newDate());
+
+      expect(onDayClickMock).toHaveBeenCalledWith(
+        expectedSelectedDate,
+        expect.objectContaining({
+          key: KeyType.Enter,
+        }),
+      );
+    });
+
     it("should call onKeyDown handler on any key press", () => {
       const onKeyDownSpy = jest.fn();
 
@@ -1020,30 +1048,6 @@ describe("YearPicker", () => {
   });
 
   describe("edge cases for coverage", () => {
-    it("should handle keyboard navigation with null selected date (Enter key)", () => {
-      const onDayClickMock = jest.fn();
-      const { container } = render(
-        <DatePicker
-          selected={null}
-          onChange={() => {}}
-          onSelect={onDayClickMock}
-          showYearPicker
-        />,
-      );
-
-      openDateInput(container);
-
-      const currentYear = container.querySelector(
-        ".react-datepicker__year-text--today",
-      ) as HTMLElement;
-
-      fireEvent.keyDown(currentYear, getKey(KeyType.Enter));
-
-      // When selected is null and Enter is pressed, onDayClick should not be called
-      // because of the early return at line 297
-      expect(onDayClickMock).not.toHaveBeenCalled();
-    });
-
     it("should handle keyboard navigation with null preSelection (Arrow keys)", () => {
       const { container } = render(
         <DatePicker
diff --git a/src/year.tsx b/src/year.tsx
index 36b363d43..c061945a1 100644
--- a/src/year.tsx
+++ b/src/year.tsx
@@ -292,9 +292,6 @@ export default class Year extends Component<YearProps> {
     if (!this.props.disabledKeyboardNavigation) {
       switch (key) {
         case KeyType.Enter:
-          if (this.props.selected == null) {
-            break;
-          }
           this.onYearClick(event, y);
           this.props.setPreSelection?.(this.props.selected);
           break;