diff --git a/docs/changes.txt b/docs/changes.txt
index 2330662962..5c32249fc8 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -199,6 +199,7 @@ wxGTK:
 - fixed bug in generic file selector causing incomplete file extensions to
   be appended to filenames with no extension
 - added SetSelection implementation for GTK+ 2
+- fixed a memory leak in generic wxFileDialog
 
 wxMSW:
 
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index bcb998dbce..00d93073b3 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1245,6 +1245,13 @@ wxFileDialog::~wxFileDialog()
         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
                                ms_lastShowHidden);
     }
+
+    const size_t count = m_choice->GetCount();
+    size_t i;
+    for ( i = 0; i < count; i++ )
+    {
+        delete (wxString *)m_choice->GetClientData(i);
+    }
 }
 
 int wxFileDialog::ShowModal()