diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
index 46db7c980b..89f9cf60f7 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
@@ -175,6 +175,24 @@ PlatOverMngrInit (
   ZeroMem (mControllerToken, MAX_CHOICE_NUM * sizeof (EFI_STRING_ID));
   ZeroMem (mDriverImageProtocol, MAX_CHOICE_NUM * sizeof (EFI_LOADED_IMAGE_PROTOCOL *));
 
+  //
+  // Show the page
+  //
+  Status = FormBrowser2->SendForm (
+                           FormBrowser2,
+                           &CallbackInfo->RegisteredHandle,
+                           1,
+                           NULL,
+                           0,
+                           NULL,
+                           NULL
+                           );
+
+  Status = HiiDatabase->RemovePackageList (HiiDatabase, CallbackInfo->RegisteredHandle);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
   return EFI_SUCCESS;
 }
 
diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf
index 0aba22113a..b523f777c7 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf
@@ -19,7 +19,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PlatOverMngr
   FILE_GUID                      = 56D95BFE-F991-4898-B3BE-B8F37C927F48
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
@@ -47,7 +47,7 @@
 [LibraryClasses]
   BaseLib
   UefiBootServicesTableLib
-  UefiDriverEntryPoint
+  UefiApplicationEntryPoint
   UefiLib
   DebugLib
   PlatDriOverLib
@@ -68,6 +68,3 @@
   gEfiComponentNameProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED
   gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
   gEfiDevicePathToTextProtocolGuid              # PROTOCOL ALWAYS_CONSUMED
-
-[Depex]
-  gEfiHiiDatabaseProtocolGuid