diff --git a/lib/file-control.php b/lib/file-control.php
index f98f63b..5b28b90 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -135,7 +135,7 @@ if ($_GET['action']=="upload") {
 		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot upload whilst in demo mode');</script>";
 	}
 
-	echo "<script>top.ICEcoder.hideFileMenu();top.ICEcoder.showHide('hide',top.document.getElementById('loadingMask'));</script>";
+	echo "<script>top.ICEcoder.hideFileMenu();top.document.getElementById('fileInput').value='';top.ICEcoder.showHide('hide',top.document.getElementById('loadingMask'));</script>";
 }
 
 // If we're due to rename a file/folder...
diff --git a/lib/ice-coder.js b/lib/ice-coder.js
index 3e0113d..7c69683 100644
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
@@ -637,9 +637,11 @@ var ICEcoder = {
 		top.document.getElementById("fileInput").click();
 	},
 	uploadFilesSubmit: function(obj) {
-		top.ICEcoder.showHide('show',top.document.getElementById('loadingMask'));
-		document.getElementById('uploadFilesForm').submit();
-		event.preventDefault();
+		if (top.document.getElementById('fileInput').value!="") {
+			top.ICEcoder.showHide('show',top.document.getElementById('loadingMask'));
+			document.getElementById('uploadFilesForm').submit();
+			event.preventDefault();
+		}
 	},
 
 	// Show menu on right clicking in file manager