diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 4dd439521e..baf36a213b 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -2484,6 +2484,10 @@ UiDisplayMenu (
           }
 
           if (Link != NewPos || Index > BottomRow || (Link == NewPos && SavedMenuOption->Row + SavedMenuOption->Skip - 1 > BottomRow)) {
+            //
+            // Find the MenuOption which has the skip value for Date/Time opcode. 
+            //
+            AdjustDateAndTimePosition(FALSE, &NewPos);
             //
             // NewPos is not in the current page, simply scroll page so that NewPos is in the end of the page
             //