diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c9f166377f..8932e2198d 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -612,6 +612,8 @@ 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")));
+    if (encName == _T("@locale"))
+        encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL        
     if (encName.empty())
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index c9f166377f..8932e2198d 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -612,6 +612,8 @@ 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")));
+    if (encName == _T("@locale"))
+        encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL        
     if (encName.empty())