diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index bc19df7e93..b404987340 100644
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -206,6 +206,7 @@ ParseCommandLineToArgs(
     return (EFI_SUCCESS);
   }
 
+  TrimSpaces(&(CHAR16*)CommandLine);
   Size = StrSize(CommandLine);
   TempParameter = AllocateZeroPool(Size);
   if (TempParameter == NULL) {
@@ -359,7 +360,6 @@ CreatePopulateInstallShellParametersProtocol (
     //
     // Populate Argc and Argv
     //
-    TrimSpaces (&FullCommandLine);
     Status = ParseCommandLineToArgs(FullCommandLine,
                                     &(*NewShellParameters)->Argv,
                                     &(*NewShellParameters)->Argc);