diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 4b8a70629d..eaf230d1d4 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -442,7 +442,7 @@ GetValueOfNumber (
     if ((Index & 1) == 0) {
       Buf [Index/2] = DigitUint8;
     } else {
-      Buf [Index/2] = (UINT8) ((Buf [Index/2] << 4) + DigitUint8);
+      Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);
     }
   }
 
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index e617f2f367..26acccd153 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1179,7 +1179,7 @@ GetQuestionValue (
             if ((Index & 1) == 0) {
               Dst [Index/2] = DigitUint8;
             } else {
-              Dst [Index/2] = (UINT8) ((Dst [Index/2] << 4) + DigitUint8);
+              Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]);
             }
           }
         }
@@ -1288,7 +1288,7 @@ GetQuestionValue (
           if ((Index & 1) == 0) {
             Dst [Index/2] = DigitUint8;
           } else {
-            Dst [Index/2] = (UINT8) ((Dst [Index/2] << 4) + DigitUint8);
+            Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]);
           }
         }
       }