diff --git a/src/kits/storage/Directory.cpp b/src/kits/storage/Directory.cpp
index 280e3dbd8a..fbcf9ae359 100644
--- a/src/kits/storage/Directory.cpp
+++ b/src/kits/storage/Directory.cpp
@@ -511,7 +511,9 @@ BDirectory::Contains(const BEntry *entry, int32 nodeFlags) const
 	uint32 dirLen = strlen(dirPath.Path());
 	
 	if (!strncmp(dirPath.Path(), entryPath.Path(), dirLen)) {
-		if (strlen(entryPath.Path()) == dirLen || entryPath.Path()[dirLen] == '/')
+		// if the paths are identical, return a match to stay consistent with
+		// BeOS behavior.
+		if (entryPath.Path()[dirLen] == '\0' || entryPath.Path()[dirLen] == '/')
 			return true;
 	}
 	return false;