diff --git a/CHANGES b/CHANGES
index d9ec9995a..3deeeee9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,10 @@ Details:
   Albrecht Schlosser:
     Add missing FL_EXPORT of class Fl_XFont_On_Demand (#922)
     Fix a bunch of compiler warnings (backported from 'master')
+    Bump version numbers from 1.3.9 to 1.3.10
+    Update bundled libraries
+    Fl_File_Chooser: set insert position to end of string (#1004)
+    ... after filename "expansion" with current directory.
 
   ManoloFLTK:
     Fix "FLTK on NetBSD very slow on X11 with Unicode locale" (#935)
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index e68285a4c..d25626128 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -838,7 +838,9 @@ Fl_File_Chooser::fileNameCB()
 #endif /* WIN32 || __EMX__ */
     fl_filename_absolute(pathname, sizeof(pathname), filename);
     value(pathname);
-    fileName->mark(fileName->position()); // no selection after expansion
+    int flen = (int)strlen(pathname);	// issue #1004
+    fileName->position(flen);		// issue #1004
+    fileName->mark(flen);		// no selection after expansion
   } else if (filename != pathname) {
     // Finally, make sure that we have a writable copy...
     strlcpy(pathname, filename, sizeof(pathname));