diff --git a/htdocs/artefact/file/js/filebrowser.js b/htdocs/artefact/file/js/filebrowser.js
index 70c66f2..80f269c 100644
--- a/htdocs/artefact/file/js/filebrowser.js
+++ b/htdocs/artefact/file/js/filebrowser.js
@@ -85,11 +85,14 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
                 }
             });
         }
-        if (self.config.submitbutton && $(self.id + '_uploadsubmit')) {
+        if (is_FF() && self.config.submitbutton && $(self.id + '_uploadsubmit')) {
             connect(self.id + '_uploadsubmit', 'onclick', self.upload_submit);
         }
         else {
             connect(self.id + '_userfile', 'onchange', self.upload_submit);
+            if ($(self.id + '_uploadsubmit')) {
+                removeElement(self.id + '_uploadsubmit');
+            }
         }
     }
 
@@ -133,10 +136,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
             'name':'userfile',
             'size':40
         }));
-        if (self.config.submitbutton && $(self.id + '_uploadsubmit')) {
-            connect(self.id + '_uploadsubmit', 'onclick', self.upload_submit);
-        }
-        else {
+        if (!$(self.id + '_uploadsubmit')) {
             connect(self.id + '_userfile', 'onchange', self.upload_submit);
         }
         $(self.id + '_upload').value = 0;
diff --git a/htdocs/js/mahara.js b/htdocs/js/mahara.js
index b436760..d9859e7 100644
--- a/htdocs/js/mahara.js
+++ b/htdocs/js/mahara.js
@@ -740,3 +740,10 @@ function keypressKeyCode(e) {
     }
     return 0;
 }
+
+function is_FF() {
+    if ( /Firefox|Gecko|Iceweasel/.test(navigator.userAgent)) {
+        return true;
+    }
+    return false;
+}
\ No newline at end of file