diff --git a/lib/ice-coder.js b/lib/ice-coder.js
index b9ba2b9..2fa7d2f 100644
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
@@ -593,7 +593,9 @@ var ICEcoder = {
 	deleteFile: function() {
 		var delFiles, selectedFilesList;
 
-		delFiles = top.ICEcoder.ask('Delete:\n\n'+top.ICEcoder.selectedFiles.toString().replace(/\|/g,"/").replace(/,/g,"\n")+'?');
+		if (top.ICEcoder.selectedFiles.length>0) {
+			delFiles = top.ICEcoder.ask('Delete:\n\n'+top.ICEcoder.selectedFiles.toString().replace(/\|/g,"/").replace(/,/g,"\n")+'?');
+		}
 		if (delFiles) {
 			selectedFilesList = "";
 			for (var i=0;i<top.ICEcoder.selectedFiles.length;i++) {
@@ -761,7 +763,7 @@ var ICEcoder = {
 		// Deleting files
 		if (action=="delete") {
 			// Simply get our target and make it dissapear
-			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(location.replace(/\//g,"|")+"|"+file).parentNode.parentNode;
+			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(location.replace(/\/$/, "").replace(/\//g,"|")+"|"+file).parentNode.parentNode;
 			targetElem.parentNode.removeChild(targetElem);
 		}
 	},