diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp
index 9c201b9d38..e38c9e489d 100644
--- a/src/kits/tracker/DeskWindow.cpp
+++ b/src/kits/tracker/DeskWindow.cpp
@@ -272,9 +272,10 @@ BDeskWindow::InitAddonsList(bool update)
 		}
 
 		BStringList addOnPaths;
-		BPathFinder::FindPaths(B_FIND_PATH_ADD_ONS_DIRECTORY, "Tracker/",
+		BPathFinder::FindPaths(B_FIND_PATH_ADD_ONS_DIRECTORY, "Tracker",
 			addOnPaths);
-		for (int32 i = 0; i < addOnPaths.CountStrings(); i++) {
+		int32 count = addOnPaths.CountStrings();
+		for (int32 i = 0; i < count; i++) {
 			LoadAddOnDir(BDirectory(addOnPaths.StringAt(i)), this,
 				fAddonsList);
 		}