diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs
index 4cf7db74d9..2c8a7c0831 100644
--- a/src/Avalonia.Controls/Calendar/Calendar.cs
+++ b/src/Avalonia.Controls/Calendar/Calendar.cs
@@ -1903,6 +1903,11 @@ namespace Avalonia.Controls
         }
         internal void ProcessPageDownKey(bool shift)
         {
+            if (!shift)
+            {
+                OnNextClick();
+                return;
+            }
             switch (DisplayMode)
             {
                 case CalendarMode.Month:
@@ -1927,6 +1932,11 @@ namespace Avalonia.Controls
         }
         internal void ProcessPageUpKey(bool shift)
         {
+            if (!shift)
+            {
+                OnPreviousClick();
+                return;
+            }
             switch (DisplayMode)
             {
                 case CalendarMode.Month: