diff --git a/EmbeddedPkg/Ebl/EfiDevice.c b/EmbeddedPkg/Ebl/EfiDevice.c
index e129a3cb8c..4d4cd3f5b7 100644
--- a/EmbeddedPkg/Ebl/EfiDevice.c
+++ b/EmbeddedPkg/Ebl/EfiDevice.c
@@ -31,13 +31,22 @@ EblPrintFsInfo (
   IN  EFI_OPEN_FILE   *File
   )
 {
+  CHAR16 *Str;
+
   if (File == NULL) {
     return;
   }
 
   AsciiPrint ("  %a: ", File->DeviceName);
   if (File->FsInfo != NULL) {
-    AsciiPrint ("%s: ", File->FsInfo->VolumeLabel);
+    for (Str = File->FsInfo->VolumeLabel; *Str != '\0'; Str++) {
+      if (*Str == ' ') {
+        // UI makes you enter _ for space, so make the printout match that
+        *Str = '_';
+      }
+      AsciiPrint ("%c", *Str);
+    }
+    AsciiPrint (":");
     if (File->FsInfo->ReadOnly) {
       AsciiPrint ("ReadOnly");
     }