1 files changed, 6 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index ae7ff7f774..6c019f0454 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -245,6 +245,11 @@ SendForm (
   gFooterHeight = FOOTER_HEIGHT + (Index / 3);
 
   //
+  // Clean the history menu list.
+  //
+  InitializeListHead (&gMenuList);
+
+  //
   // Save globals used by SendForm()
   //
   SaveBrowserContext ();
@@ -378,6 +383,7 @@ SendForm (
   }
 
   FreeBrowserStrings ();
+  UiFreeMenuList(&gMenuList);
 
   gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));
   gST->ConOut->ClearScreen (gST->ConOut);