4 files changed, 5 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 9f795b9d84..0a1f7eee37 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -889,7 +889,7 @@ IScsiFormCallback (
             BufferSize,
             &Private->Current->AuthConfigData
             );
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY
       break;
 
     default:
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
index c3886dffac..5a578a421e 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 8abe77f4bb..6d544f5321 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -273,7 +273,7 @@ VlanCallback (
       //
       // Clear UI data
       //
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
       Configuration->VlanId = 0;
       Configuration->Priority = 0;
       break;
@@ -301,7 +301,7 @@ VlanCallback (
         gBS->ConnectController (PrivateData->ControllerHandle, NULL, NULL, TRUE);
       }
 
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
       ZeroMem (Configuration->VlanList, MAX_VLAN_NUMBER);
       break;
 
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index bff79570db..2fab5b79c9 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1244,10 +1244,12 @@ ProcessCallBackFunction (
       switch (ActionRequest) {
       case EFI_BROWSER_ACTION_REQUEST_RESET:
         gResetRequired = TRUE;
+        Selection->Action = UI_ACTION_EXIT;
         break;
 
       case EFI_BROWSER_ACTION_REQUEST_SUBMIT:
         SubmitFormIsRequired = TRUE;
+        Selection->Action = UI_ACTION_EXIT;
         break;
 
       case EFI_BROWSER_ACTION_REQUEST_EXIT: