diff --git a/docs/changes.txt b/docs/changes.txt
index 2a9423d6fc..1559d0eaaa 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -71,6 +71,9 @@ wxGTK:
 - made wxTextCtrl::EmulateKeyPress() work for Delete and Backspace
 - fixed wxTopLevelWindow::ShowFullScreen to work with kwin, IceWM and
   window managers that support _NET_WM_STATE_FULLSCREEN
+- Added wxEVT_MENU_OPEN event generation.
+- Fixed bug in generic file selector causing incomplete file extensions to
+  be appended to filenames with no extension.
 
 wxMSW:
 
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index a1b704fcd5..611fcf0a04 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1239,8 +1239,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