diff --git a/src/test/year_picker_test.test.tsx b/src/test/year_picker_test.test.tsx
index 6721abcd2..8ecab2ce9 100644
--- a/src/test/year_picker_test.test.tsx
+++ b/src/test/year_picker_test.test.tsx
@@ -634,6 +634,20 @@ describe("YearPicker", () => {
       expect(selectedYear?.textContent).toBe(`${currentYear}`);
     });
 
+    it("should set the key-selected class (pre-select) automatically to the current year when there is no selected date passed - in the Inline Mode", () => {
+      const { container } = render(
+        <DatePicker showYearPicker dateFormat="yyyy" inline />,
+      );
+
+      const selectedYear = container.querySelector(
+        ".react-datepicker__year-text--keyboard-selected",
+      );
+      expect(selectedYear).toBeDefined();
+
+      const currentYear = new Date().getFullYear();
+      expect(selectedYear?.textContent).toBe(`${currentYear}`);
+    });
+
     it("should set the date to the selected year of the previous period when previous button clicked", () => {
       let date: Date | null;
       const expectedDate = getStartOfYear(setYear(newDate(), 2008));
diff --git a/src/year.tsx b/src/year.tsx
index 36b363d43..8e05674d8 100644
--- a/src/year.tsx
+++ b/src/year.tsx
@@ -250,12 +250,7 @@ export default class Year extends Component<YearProps> {
       getStartOfYear(this.props.preSelection),
     );
 
-    return (
-      !this.props.inline &&
-      !isSelectedDay &&
-      isKeyboardSelectedDay &&
-      !isDisabled
-    );
+    return !isSelectedDay && isKeyboardSelectedDay && !isDisabled;
   };
 
   isSelectedYear = (year: number) => {