diff --git a/ArmPlatformPkg/Bds/Bds.c b/ArmPlatformPkg/Bds/Bds.c
index 8f7f9fdf7c..c5246a0f0b 100644
--- a/ArmPlatformPkg/Bds/Bds.c
+++ b/ArmPlatformPkg/Bds/Bds.c
@@ -390,6 +390,9 @@ BdsEntry (
 {
   UINTN               Size;
   EFI_STATUS          Status;
+  UINT16             *BootNext;
+  UINTN               BootNextSize;
+  CHAR16              BootVariableName[9];
 
   PERF_END   (NULL, "DXE", NULL, 0);
 
@@ -404,16 +407,38 @@ BdsEntry (
   }
 
   // If BootNext environment variable is defined then we just load it !
-  Status = BdsStartBootOption (L"BootNext");
-  if (Status != EFI_NOT_FOUND) {
-    // BootNext has not been succeeded launched
-    if (EFI_ERROR(Status)) {
-      Print(L"Fail to start BootNext.\n");
+  BootNextSize = sizeof(UINT16);
+  Status = GetEnvironmentVariable (L"BootNext", NULL, &BootNextSize, (VOID**)&BootNext);
+  if (!EFI_ERROR(Status)) {
+    ASSERT(BootNextSize == sizeof(UINT16));
+
+    // Generate the requested Boot Entry variable name
+    UnicodeSPrint (BootVariableName, 9 * sizeof(CHAR16), L"Boot%04X", *BootNext);
+
+    // Set BootCurrent variable
+    gRT->SetVariable (L"BootCurrent", &gEfiGlobalVariableGuid,
+              EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
+              BootNextSize, BootNext);
+
+    FreePool (BootNext);
+
+    // Start the requested Boot Entry
+    Status = BdsStartBootOption (BootVariableName);
+    if (Status != EFI_NOT_FOUND) {
+      // BootNext has not been succeeded launched
+      if (EFI_ERROR(Status)) {
+        Print(L"Fail to start BootNext.\n");
+      }
+
+      // Delete the BootNext environment variable
+      gRT->SetVariable (L"BootNext", &gEfiGlobalVariableGuid,
+          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
+          0, NULL);
     }
 
-    // Delete the BootNext environment variable
-    gRT->SetVariable (L"BootNext", &gEfiGlobalVariableGuid,
-        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
+    // Clear BootCurrent variable
+    gRT->SetVariable (L"BootCurrent", &gEfiGlobalVariableGuid,
+        EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
         0, NULL);
   }