diff --git a/xpfe/components/filepicker/res/content/filepicker.js b/xpfe/components/filepicker/res/content/filepicker.js
index 3ac461370948..447bbe62df59 100644
--- a/xpfe/components/filepicker/res/content/filepicker.js
+++ b/xpfe/components/filepicker/res/content/filepicker.js
@@ -413,11 +413,11 @@ function getOKAction(file) {
   var buttonLabel;
 
   if (file && file.isDirectory() && filePickerMode != nsIFilePicker.modeGetFolder) {
-    document.documentElement.setAttribute("ondialogaccept", "openOnOK");
+    document.documentElement.setAttribute("ondialogaccept", "return openOnOK();");
     buttonLabel = gFilePickerBundle.getString("openButtonLabel");
   }
   else {
-    document.documentElement.setAttribute("ondialogaccept", "selectOnOK");
+    document.documentElement.setAttribute("ondialogaccept", "return selectOnOK();");
     switch(filePickerMode) {
     case nsIFilePicker.modeGetFolder:
       buttonLabel = gFilePickerBundle.getString("selectFolderButtonLabel");