1 files changed, 5 insertions, 5 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 2b0f052060..a1e6f81ecb 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -322,11 +322,6 @@ SendForm (
       CopyMem (&Selection->FormSetGuid, &gEfiHiiPlatformSetupFormsetGuid, sizeof (EFI_GUID));
     }
 
-    //
-    // Try to find pre FormSet in the maintain backup list.
-    //
-    gOldFormSet = GetFormSetFromHiiHandle (Selection->Handle);
-
     do {
       FormSet = AllocateZeroPool (sizeof (FORM_BROWSER_FORMSET));
       ASSERT (FormSet != NULL);
@@ -342,6 +337,11 @@ SendForm (
       Selection->FormSet = FormSet;
 
       //
+      // Try to find pre FormSet in the maintain backup list.
+      //
+      gOldFormSet = GetFormSetFromHiiHandle (Selection->Handle);
+
+      //
       // Display this formset
       //
       gCurrentSelection = Selection;