diff --git a/xpfe/components/filepicker/res/content/filepicker.js b/xpfe/components/filepicker/res/content/filepicker.js
index 65f5ac9379d..e5db3a0ebef 100644
--- a/xpfe/components/filepicker/res/content/filepicker.js
+++ b/xpfe/components/filepicker/res/content/filepicker.js
@@ -100,7 +100,7 @@ function onOK()
     if (isFile) {
       retvals.directory = file.parent.path;
       ret = nsIFilePicker.returnOK;
-    } else if (isDirectory) {
+    } else if (isDir) {
       if (!sfile.equals(file)) {
         gotoDirectory(file.path);
       }
@@ -338,35 +338,3 @@ function gotoDirectory(directoryName) {
   sfile.normalize();
   loadDirectory();
 }
-
-
-
-function textEntered(name) {
-  var file = Components.classes[nsILocalFile_PROGID].createInstance(nsILocalFile);
-  file.initWithPath(name);
-  dump("*** " + file + "\n*** " + file.path + "\n");
-  if (file.exists()) {
-    if (file.isDirectory()) {
-      if (!sfile.equals(file)) {
-        gotoDirectory(name);
-      }
-      return;
-    } else if (file.isFile()) {
-      retvals.file = file;
-      window.close();
-    }
-  } else {
-    /* look for something in our current directory */
-    var nfile = sfile.clone();
-    nfile.append(file.path);
-    dump(nfile.path);
-    if (nfile.isFile()) {
-      retvals.file = nfile;
-      window.close();
-    } else if (nfile.isDirectory()) {
-      gotoDirectory(nfile.path);
-    } else {
-      dump("can't find file \"" + nfile.path + "\"");
-    }
-  }
-}
diff --git a/xpfe/components/filepicker/res/content/filepicker.xul b/xpfe/components/filepicker/res/content/filepicker.xul
index 5a8fda17c58..f7460db6d69 100644
--- a/xpfe/components/filepicker/res/content/filepicker.xul
+++ b/xpfe/components/filepicker/res/content/filepicker.xul
@@ -41,7 +41,7 @@
 
 <box align="horizontal">
   <text value="File name:"/>
-  <html:input type="text" id="textInput" onkeyup="if (event.which == 13) { textEntered(event.target.value); }" flex="1"/>
+  <html:input type="text" id="textInput" onkeyup="if (event.which == 13) { onOK(); }" flex="1"/>
 </box>
 
 <box align="horizontal">