diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
index 98e14c7d63..fdcb56a9df 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
@@ -1111,6 +1111,7 @@ BootMaintCallback (
         // 2. Re-scan the BootOption menus (including the legacy boot option).
         //
         CustomizeMenus ();
+        EfiBootManagerRefreshAllBootOption ();
         BOpt_GetBootOptions (Private);
         mFirstEnterBMMForm = TRUE;
       }
@@ -1690,8 +1691,6 @@ BootMaintenanceManagerUiLibConstructor (
   Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &mBmmCallbackInfo->FormBrowser2);
   ASSERT_EFI_ERROR (Status);
 
-  EfiBootManagerRefreshAllBootOption ();
-
   //
   // Create LoadOption in BmmCallbackInfo for Driver Callback
   //