diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index c26e789e809..18c5aefe652 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1473,11 +1473,18 @@
                             });
 
                             if ($(this).val() == 'icmp') {
+                              $icmpFields.show();
                               $icmpFields.attr('disabled', false);
                               $otherFields.attr('disabled', 'disabled');
+                              $otherFields.hide();
+                              $otherFields.parent().find('label.error').hide();
                             } else {
+                              $otherFields.show();
+                              $otherFields.parent().find('label.error').hide();
                               $otherFields.attr('disabled', false);
                               $icmpFields.attr('disabled', 'disabled');
+                              $icmpFields.hide();
+                              $icmpFields.parent().find('label.error').hide();
                             }
                           });
 
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index c884d2e883a..baf32f8c458 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -670,7 +670,7 @@
           var $range = $('<div>').addClass('range').appendTo($td);
 
           $(field.range).each(function() {
-            $('<input>')
+            var $input = $('<input>')
               .attr({
                 name: this,
                 type: 'text'
@@ -680,9 +680,11 @@
               .appendTo(
                 $('<div>').addClass('range-item').appendTo($range)
               );
+
+            if (field.isDisabled) $input.hide();
           });
         } else {
-          $('<input>')
+          var $input = $('<input>')
             .attr({
               name: fieldName,
               type: field.isPassword ? 'password' : 'text'
@@ -690,6 +692,8 @@
             .addClass(!field.isOptional ? 'required' : null)
             .attr('disabled', field.isDisabled ? 'disabled' : false)
             .appendTo($td);
+
+          if (field.isDisabled) $input.hide();
         }
       } else if (field.custom) {
         $('<div>').addClass('button add-vm custom-action')