diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index aaff62a6cb..740ee50d0b 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -269,8 +269,8 @@ SendForm (
 
   gOptionBlockWidth = (CHAR16) ((gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3);
   gHelpBlockWidth   = gOptionBlockWidth;
-  gPromptBlockWidth = gOptionBlockWidth + LEFT_SKIPPED_COLUMNS;
-  gOptionBlockWidth = gOptionBlockWidth - LEFT_SKIPPED_COLUMNS;
+  gPromptBlockWidth = (CHAR16) (gOptionBlockWidth + LEFT_SKIPPED_COLUMNS);
+  gOptionBlockWidth = (CHAR16) (gOptionBlockWidth - LEFT_SKIPPED_COLUMNS);
 
   //
   // Initialize the strings for the browser, upon exit of the browser, the strings will be freed
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index a77d4a9e02..0e74c5800d 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -1134,7 +1134,7 @@ GetWidth (
     Width -= SUBTITLE_INDENT;
   }
 
-  return Width - LEFT_SKIPPED_COLUMNS;
+  return (UINT16) (Width - LEFT_SKIPPED_COLUMNS);
 }
 
 /**