diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js
index 2aadbd045..8d53840c0 100644
--- a/src/webui/scripts/client.js
+++ b/src/webui/scripts/client.js
@@ -143,6 +143,10 @@ window.addEvent('domready', function(){
 
 });
 
+function closeWindows() {
+  MochaUI.closeAll();
+}
+
 // This runs when a person leaves your page.
 
 window.addEvent('unload', function(){
diff --git a/src/webui/upload.html b/src/webui/upload.html
index 3a3dd5d61..2d912ff71 100644
--- a/src/webui/upload.html
+++ b/src/webui/upload.html
@@ -11,6 +11,7 @@
 function showSuccess() {
   $('myiframe').addClass('invisible');
   $('successMessage').removeClass('invisible');
+  window.parent.closeWindows();
 }
 </script>
 </head>
diff --git a/src/webui/uploadframe.html b/src/webui/uploadframe.html
index ac2cb137f..c413f9c0e 100644
--- a/src/webui/uploadframe.html
+++ b/src/webui/uploadframe.html
@@ -6,7 +6,6 @@
         <link rel="stylesheet" href="css/style.css" type="text/css" />
         <link rel="stylesheet" href="css/mocha.css" type="text/css" />
         <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
-        <script type="text/javascript" src="scripts/mocha.js"></script>
         <!-- <script type="text/javascript" src="scripts/upload.js" charset="utf-8"></script> -->
 <script type="text/javascript">
 function submitForm(form) {
@@ -16,7 +15,6 @@ function submitForm(form) {
   }
   document.uploadForm.submit();
   window.parent.showSuccess();
-  //MochaUI.closeAll();
 }
 </script>
 </head>