diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index 7a385cd9d..d85734616 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -1077,10 +1077,10 @@ $( document ).ready(function() {
                   <td><a id="help_for_fra" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Filter rule association"); ?></td>
                   <td>
                     <select name="filter-rule-association">
-                      <option value=""><?=gettext("None"); ?></option>
-                      <option value="add-associated" selected="selected"><?=gettext("Add associated filter rule"); ?></option>
+                      <option value="" <?= empty($pconfig['associated-rule-id']) ? " selected=\"selected\"" : ""; ?>><?=gettext("None"); ?></option>
+                      <option value="add-associated" <?= !empty($pconfig['associated-rule-id']) && $pconfig['associated-rule-id'] != "pass" ? " selected=\"selected\"" : ""; ?>><?=gettext("Add associated filter rule"); ?></option>
                       <option value="add-unassociated"><?=gettext("Add unassociated filter rule"); ?></option>
-                      <option value="pass"><?=gettext("Pass"); ?></option>
+                      <option value="pass" <?= $pconfig['associated-rule-id'] == "pass" ? " selected=\"selected\"" : ""; ?>><?=gettext("Pass"); ?></option>
                     </select>
                     <div class="hidden" data-for="help_for_fra">
                       <?=gettext("NOTE: The \"pass\" selection does not work properly with Multi-WAN. It will only work on an interface containing the default gateway.")?>