diff --git a/src/fileio.cpp b/src/fileio.cpp
index c7f14f18fe..e936850912 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -1375,6 +1375,18 @@ uint FileScanner::Scan(const char *extension, Subdirectory sd, bool tars, bool r
 		}
 	}
 
+	switch (sd) {
+		case BASESET_DIR:
+			num += this->Scan(extension, OLD_GM_DIR, tars, recursive);
+			break;
+
+		case NEWGRF_DIR:
+			num += this->Scan(extension, OLD_DATA_DIR, tars, recursive);
+			break;
+
+		default: break;
+	}
+
 	return num;
 }