diff --git a/ETL/ETL/_stringf.h b/ETL/ETL/_stringf.h
index bbbe880e774..f292f56f83e 100644
--- a/ETL/ETL/_stringf.h
+++ b/ETL/ETL/_stringf.h
@@ -38,6 +38,7 @@
 #include <cstdarg>
 #include <cstdlib>
 #include <cstdio>
+#include <glibmm/miscutils.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -240,12 +241,8 @@ unix_to_local_path(const std::string &path)
 }
 
 inline std::string
-current_working_directory()
-{
-	char dir[256];
-	// TODO: current_working_directory() should use Glib::locale_to_utf8()
-	std::string ret(getcwd(dir,sizeof(dir)));
-	return ret;
+current_working_directory() {
+	return Glib::get_current_dir();
 }
 
 inline std::string