1 files changed, 12 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 82ffcf2215..57fe339129 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -237,11 +237,20 @@ VlanCallback (
   PrivateData = VLAN_CONFIG_PRIVATE_DATA_FROM_THIS (This);
 
   if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {
+    if (QuestionId == VLAN_ADD_QUESTION_ID) {
+      //
+      // Update current VLAN list into Form when Form is opened.
+      // This will be done only in FORM_OPEN CallBack of question with VLAN_ADD_QUESTION_ID.
+      //
+      VlanUpdateForm (PrivateData);
+    }
+    return EFI_SUCCESS;
+  }
+
+  if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) {
     //
-    // On FORM_OPEN event, update current VLAN list
+    // Do nothing for UEFI FORM_CLOSE action
     //
-    VlanUpdateForm (PrivateData);
-
     return EFI_SUCCESS;
   }