diff --git a/common/FileSystem.cpp b/common/FileSystem.cpp
index bb9bb154d4..e289ba86f5 100644
--- a/common/FileSystem.cpp
+++ b/common/FileSystem.cpp
@@ -1557,6 +1557,7 @@ std::string FileSystem::GetWorkingDirectory()
 		buffer.resize(buffer.size() * 2);
 	}
 
+	buffer.resize(std::strlen(buffer.c_str())); // Remove excess nulls
 	return buffer;
 }