diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 0e5d954e45..6f292507a9 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -2509,6 +2509,10 @@ ShellSearchHandle(
     }
   }
 
+  if (*FileList == NULL || (*FileList != NULL && IsListEmpty(&(*FileList)->Link))) {
+    Status = EFI_NOT_FOUND;
+  }
+
   FreePool(CurrentFilePattern);
   return (Status);
 }