diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c
index 6d13d3f..3e62890 100644
--- a/src/pw3270/common/config.c
+++ b/src/pw3270/common/config.c
@@ -620,7 +620,6 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 	}
 #endif // HAVE_WIN_REGISTRY
 
-
 	if(!result)
 	{
 		// Search for application folder on system data dirs
@@ -643,10 +642,37 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 		}
 
 	}
+
+#ifdef DEBUG
+	if(!result)
+	{
+		int f;
+		gchar *dir = g_get_current_dir();
+
+		for(f=0;f<2 && dir;f++)
+		{
+			gchar *ptr = dir;
+			dir = g_path_get_dirname(ptr);
+			g_free(ptr);
+		}
+
+		if(dir)
+		{
+			gchar *name = g_build_filename(dir,"ui",NULL);
+			if(g_file_test(name,G_FILE_TEST_IS_DIR))
+				result = g_string_new(dir);
+			g_free(name);
+			g_free(dir);
+		}
+
+	}
+#endif // DEBUG
 
 	if(!result)
-	{
-		result = g_string_new(g_get_current_dir());
+	{
+		gchar *dir = g_get_current_dir();
+		result = g_string_new(dir);
+		g_free(dir);
 		g_warning("Unable to find application datadir, using %s",result->str);
 	}
 
--
libgit2 0.21.2