diff --git a/src/apps/debugger/files/FileManager.cpp b/src/apps/debugger/files/FileManager.cpp
index cae6d5564f..8630cf2b2d 100644
--- a/src/apps/debugger/files/FileManager.cpp
+++ b/src/apps/debugger/files/FileManager.cpp
@@ -199,17 +199,10 @@ private:
 			return false;
 		}
 
-		// locate the parent, if possible, otherwise this directory
-		BString locatedDirectory;
-		BString locatedName;
-		_SplitNormalizedPath(locatedPath, locatedDirectory, locatedName);
-		if (locatedName != directory->Name())
+		if (!_LocateEntry(directory, locatedPath, true, true))
 			return false;
 
-		if (_LocateDirectory(directory->Parent(), locatedDirectory)) {
-			directory->SetLocatedPath(locatedPath, true);
-			_LocateEntries(directory, locatedPath);
-		}
+		_LocateEntries(directory, locatedPath);
 
 		return true;
 	}