2 files changed, 22 insertions, 6 deletions
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index c8ca25e87f..3950bbb169 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
@@ -848,7 +848,17 @@ DeviceManagerCallback (
 {
   UINTN  CurIndex;
 
-  if (Action != EFI_BROWSER_ACTION_CHANGING) {
+  if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {
+    //
+    // Means enter the device manager form.
+    // Update device manager page when form opens, because options may add or remove.
+    //
+    if (QuestionId == 0x1212) {
+      CreateDeviceManagerForm (DEVICE_MANAGER_FORM_ID);
+    }
+
+    return EFI_SUCCESS;
+  } else if (Action != EFI_BROWSER_ACTION_CHANGING) {
     //
     // Do nothing for other UEFI Action. Only do call back when data is changed.
     //
@@ -926,11 +936,6 @@ DeviceManagerUiLibConstructor (
   //
   EfiBootManagerConnectAll ();
 
-  //
-  // Update boot manager page
-  //
-  CreateDeviceManagerForm (DEVICE_MANAGER_FORM_ID);
-
   return EFI_SUCCESS;
 }
 
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr
index d81c580fe7..911ea036b8 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr
@@ -28,6 +28,17 @@ formset
     title  = STRING_TOKEN(STR_EDKII_MENU_TITLE);
     subtitle text = STRING_TOKEN(STR_DEVICES_LIST);
 
+    //
+    // Add this invisable text in order to indicate enter Device Manager form.
+    //
+    suppressif TRUE;
+          text
+              help  = STRING_TOKEN(STR_EMPTY_STRING),
+              text  = STRING_TOKEN(STR_EMPTY_STRING),
+              flags = INTERACTIVE,
+              key   = 0x1212;
+    endif;
+
     label LABEL_DEVICES_LIST;
     label LABEL_END;