diff --git a/data/jids/filesel.jid b/data/jids/filesel.jid
index 055aaa502..eca1903e9 100644
--- a/data/jids/filesel.jid
+++ b/data/jids/filesel.jid
@@ -14,7 +14,7 @@
     <box vertical expansive name="box" />
     <box horizontal>
       <label text="Name:" />
-      <entry text="" maxsize=256 name="filename" expansive />
+      <entry text="" maxsize=256 name="filename" expansive magnetic />
       <combobox name="filetype" minwidth=70 />
     </box>
     <box horizontal>
diff --git a/src/dialogs/filesel.cpp b/src/dialogs/filesel.cpp
index fdd02d636..5cf29050e 100644
--- a/src/dialogs/filesel.cpp
+++ b/src/dialogs/filesel.cpp
@@ -168,7 +168,6 @@ jstring ase_file_selector(const jstring& message,
     jwidget_add_hook(filename_entry, -1, filename_msg_proc, NULL);
 
     jwidget_set_name(fileview, "fileview");
-    jwidget_magnetic(fileview, TRUE);
 
     jview_attach(view, fileview);
     jwidget_expansive(view, TRUE);
@@ -210,6 +209,7 @@ jstring ase_file_selector(const jstring& message,
   // file name entry field
   jwidget_set_text(filename_entry, init_path.filename().c_str());
   select_filetype_from_filename(window);
+  jentry_select_text(filename_entry, 0, -1);
 
   // setup the title of the window
   jwidget_set_text(window, message.c_str());
@@ -622,6 +622,7 @@ static bool filetype_msg_proc(JWidget widget, JMessage msg)
 	if (p && *p != 0) {
 	  ustrcpy(p, ext);
 	  jwidget_set_text(entry, buf);
+	  jentry_select_text(entry, 0, -1);
 	}
 	break;
       }
diff --git a/src/jinete/jmanager.cpp b/src/jinete/jmanager.cpp
index bec1372eb..eabd80b7e 100644
--- a/src/jinete/jmanager.cpp
+++ b/src/jinete/jmanager.cpp
@@ -967,8 +967,7 @@ void _jmanager_open_window(JWidget manager, JWidget window)
 {
   JMessage msg;
 
-  /* TODO check if this is necessary... */
-  /* free all widgets of special states */
+  // free all widgets of special states
   if (jwindow_is_wantfocus(window)) {
     jmanager_free_capture();
     jmanager_free_mouse();