diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c b/ShellPkg/Application/Shell/FileHandleWrappers.c
index c67ddfc269..59c1ee55ee 100644
--- a/ShellPkg/Application/Shell/FileHandleWrappers.c
+++ b/ShellPkg/Application/Shell/FileHandleWrappers.c
@@ -417,7 +417,7 @@ FileInterfaceStdInRead(
     gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &EventIndex);
     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
     if (EFI_ERROR (Status)) {
-      continue;
+      break;
     }
 
     //
@@ -849,7 +849,7 @@ FileInterfaceStdInRead(
   //
   ASSERT(FoundFileList == NULL);
 
-  return EFI_SUCCESS;
+  return Status;
 }
 
 //