diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 3006d0597d..cb45a0b580 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -92,7 +92,7 @@ ReadString (
   //
   // Display prompt for string
   //
-  CreatePopUp (ScreenSize, 4, &NullCharacter, Prompt, Space, &NullCharacter);
+  CreateMultiStringPopUp (ScreenSize, 4, &NullCharacter, Prompt, Space, &NullCharacter);
 
   gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_BLACK, EFI_LIGHTGRAY));
 
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index bc79a1e293..2885ae3950 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -919,7 +919,7 @@ CreateSharedPopUp (
 
 **/
 VOID
-CreatePopUp (
+CreateMultiStringPopUp (
   IN  UINTN                       RequestedWidth,
   IN  UINTN                       NumberOfLines,
   ...
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
index 6842fe9d7a..2c144486dd 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -363,7 +363,7 @@ UiWaitForSingleEvent (
 
 **/
 VOID
-CreatePopUp (
+CreateMultiStringPopUp (
   IN  UINTN                       ScreenWidth,
   IN  UINTN                       NumberOfLines,
   ...