diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index a33a764782f..fbc96a3d8fa 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1254,9 +1254,12 @@
     var jsonObj = args.context.item;
     var allowedActions = [];
 
-    if (jsonObj.state == 'Destroyed' || jsonObj.state == 'Migrating') {
+    if (jsonObj.state == 'Destroyed' || jsonObj.state == 'Migrating' || jsonObj.state == 'Uploading') {
       return [];
     }
+		if (jsonObj.state == 'UploadError') {
+      return ["remove"];
+    }
 
     if(jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {
       allowedActions.push("takeSnapshot");