1 files changed, 3 insertions, 1 deletions
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 9cc4ca38c1..ec4559480d 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -1914,6 +1914,8 @@ CreateAndPopulateShellFileInfo(
     }
   }
 
+  TempString = PathCleanUpDirectories(TempString);
+
   ShellFileListItem->FullName = TempString;
   ShellFileListItem->Status   = Status;
   ShellFileListItem->Handle   = Handle;
@@ -2143,7 +2145,7 @@ ShellSearchHandle(
       //
       FileInfo = FileHandleGetInfo(FileHandle);
       NewShellNode = CreateAndPopulateShellFileInfo(
-        L":",
+        MapName,
         EFI_SUCCESS,
         L"\\",
         FileHandle,