diff --git a/docs/changes.txt b/docs/changes.txt
index e81be5fbcf..a159d2ee6f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -184,6 +184,13 @@ All:
 
 - Added missing wx/quantize.h to install.
 
+wxGTK:
+
+- Added wxEVT_MENU_OPEN event generation.
+- Fixed bug in generic file selector causing incomplete file extensions to
+  be appended to filenames with no extension.
+
+
 2.4.0
 -----
 
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 8e8f0365c4..bcb998dbce 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1262,8 +1262,8 @@ void wxFileDialog::DoSetFilterIndex(int filterindex)
     m_filterIndex = filterindex;
     if ( str->Left(2) == wxT("*.") )
     {
-        m_filterExtension = str->Mid(2);
-        if (m_filterExtension == _T("*"))
+        m_filterExtension = str->Mid(1);
+        if (m_filterExtension == _T(".*"))
             m_filterExtension.clear();
     }
     else