diff --git a/src/fileio.cpp b/src/fileio.cpp
index 9f3d7ea946..86714d1089 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -1317,6 +1317,8 @@ static uint ScanTar(FileScanner *fs, const char *extension, TarFileList::iterato
  */
 uint FileScanner::Scan(const char *extension, Subdirectory sd, bool tars, bool recursive)
 {
+	this->subdir = sd;
+
 	Searchpath sp;
 	char path[MAX_PATH];
 	TarFileList::iterator tar;
diff --git a/src/fileio_func.h b/src/fileio_func.h
index 162ad3b1cb..30aa997ae4 100644
--- a/src/fileio_func.h
+++ b/src/fileio_func.h
@@ -67,8 +67,9 @@ bool ExtractTar(const char *tar_filename);
 extern char *_personal_dir; ///< custom directory for personal settings, saves, newgrf, etc.
 
 /** Helper for scanning for files with a given name */
-class FileScanner
-{
+class FileScanner {
+protected:
+	Subdirectory subdir; ///< The current sub directory we are searching through
 public:
 	/** Destruct the proper one... */
 	virtual ~FileScanner() {}