diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 4d25eb73de..a75aabe611 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -616,6 +616,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // (1) this variable exists for the sole purpose of specifying the encoding
     //     of the filenames for GTK+ programs, so use it if it is set
     wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
+    encName = encName.BeforeFirst(_T(','));
     if (encName == _T("@locale"))
         encName.clear();
     encName.MakeUpper();
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 4d25eb73de..a75aabe611 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -616,6 +616,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // (1) this variable exists for the sole purpose of specifying the encoding
     //     of the filenames for GTK+ programs, so use it if it is set
     wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
+    encName = encName.BeforeFirst(_T(','));
     if (encName == _T("@locale"))
         encName.clear();
     encName.MakeUpper();