diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index ac27ff555f7..e9f5a54049e 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -6802,7 +6802,7 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   text-shadow: 0px 1px #FFFFFF;
 }
 
-.multi-edit .disabled .button.custom-action {
+.multi-edit .disabled .button.add-vm {
   /*+opacity:50%;*/
   filter: alpha(opacity=50);
   -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index cece45e56c9..8ecd5205f02 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -139,6 +139,8 @@
           } else if (field.addButton && !options.noSelect) {
             if (options.multipleAdd) {
               $addButton.click(function() {
+                if ($td.hasClass('disabled')) return false;
+                
                 _medit.vmList($multi,
                               options.listView,
                               options.context,
@@ -147,6 +149,8 @@
                               {
                                 multiRule: multiRule
                               });
+
+                return true;
               });
               $td.append($addButton);
             } else {