diff --git a/ChangeLog b/ChangeLog
index 3824efe0f..b022cff14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-02  David A. Capello  <davidcapello@gmail.com>
+
+	* src/dialogs/filesel.cpp (ase_file_selector): Fixed a bug
+	when the user presses ENTER with an empty file name.
+
 2009-03-01  David A. Capello  <davidcapello@gmail.com>
 
 	* src/widgets/editor/cursor.cpp (editor_clean_cursor): Fixed a
diff --git a/NEWS.txt b/NEWS.txt
index 30327eb8e..74503f5c8 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -8,6 +8,8 @@ NEWS
 + Added "Save Copy As" command (feature #2636076).
 + Fixed compilation support for gcc 64 bits.
 + Fixed a bug with multiple editors and paste command.
++ Fixed a bug in the File Open dialog when user presses ENTER key
+  with an empty file name.
 
 0.6.1
 -----
diff --git a/src/dialogs/filesel.cpp b/src/dialogs/filesel.cpp
index 86c016950..db569a290 100644
--- a/src/dialogs/filesel.cpp
+++ b/src/dialogs/filesel.cpp
@@ -239,10 +239,14 @@ again:
       if (!enter_folder)
 	enter_folder = folder;
     }
-    else {
+    else if (!fn.empty()) {
       // check if the user specified in "fn" a item of "fileview"
       const FileItemList& children = fileview_get_filelist(fileview);
 
+#ifdef ALLEGRO_WINDOWS
+      fn.tolower();
+#endif
+
       for (FileItemList::const_iterator
 	     it=children.begin(); it!=children.end(); ++it) {
 	FileItem* child = *it;
@@ -250,7 +254,6 @@ again:
 
 #ifdef ALLEGRO_WINDOWS
 	child_name.tolower();
-	fn.tolower();
 #endif
 	if (child_name == fn) {
 	  enter_folder = *it;
@@ -297,6 +300,11 @@ again:
 	enter_folder = get_fileitem_from_path(buf);
       }
     }
+    else {
+      // show the window again
+      jwidget_show(window);
+      goto again;
+    }
 
     // did we find a folder to enter?
     if (enter_folder &&