diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php
index 876bb8e52..c4eadee54 100644
--- a/src/www/firewall_nat_1to1_edit.php
+++ b/src/www/firewall_nat_1to1_edit.php
@@ -196,6 +196,7 @@ include("head.inc");
                     } else {
                       $(this).removeClass("hidden");
                     }
+                    $(this).prop("disabled", false);
                   });
               } else {
                   // hide related controls
@@ -205,6 +206,7 @@ include("head.inc");
                     } else {
                       $(this).addClass("hidden");
                     }
+                    $(this).prop("disabled", true);
                   });
               }
             });
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index e813d7c43..f9ad5e933 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -661,6 +661,7 @@ include("head.inc");
                       } else {
                         $(this).removeClass("hidden");
                       }
+                      $(this).prop("disabled", false);
                     });
                 } else {
                     // hide related controls
@@ -670,6 +671,7 @@ include("head.inc");
                       } else {
                         $(this).addClass("hidden");
                       }
+                      $(this).prop("disabled", true);
                     });
                 }
               });