diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1b66055a466..86d496b389d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -7288,6 +7288,11 @@
       allowedActions.push("edit");
       allowedActions.push("remove");
     }
+		
+		if((jsonObj.state == "Down" || jsonObj.state == "Alert" || jsonObj.state == "Disconnected") && ($.inArray("remove", allowedActions) == -1)) {	      	  
+		  allowedActions.push("remove");
+		}
+		
     return allowedActions;
   }