diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index ee40e40f08..de7dc3cad9 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -588,7 +588,7 @@ EfiShellGetDevicePathFromFilePath(
   if (*(Path+StrLen(MapName)+1) == CHAR_NULL) {
     DevicePathForReturn = FileDevicePath(Handle, L"\\");
   } else {
-    DevicePathForReturn = FileDevicePath(Handle, Path+StrLen(MapName)+1);
+    DevicePathForReturn = FileDevicePath(Handle, Path+StrLen(MapName));
   }
 
   FreePool(MapName);