diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index 042f186e0..412eb1151 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -736,7 +736,7 @@ $( document ).ready(function() {
 <?php
                 $ifgroups = [];
                 foreach (config_read_array('ifgroups', 'ifgroupentry') as $ifgroup) {
-                    if (!empty($ifgroup['members']) && in_array($selected_if, explode(' ', $ifgroup['members']))) {
+                    if (!empty($ifgroup['members']) && in_array($selected_if, preg_split('/[ |,]+/', $ifgroup['members']))) {
                         $ifgroups[] = $ifgroup['ifname'];
                     }
                 }
diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index 676dbff50..1648e766c 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -42,7 +42,7 @@ function link_interface_to_group($int)
 
     if (isset($config['ifgroups']['ifgroupentry'])) {
         foreach ($config['ifgroups']['ifgroupentry'] as $group) {
-            if (in_array($int, explode(" ", $group['members']))) {
+            if (in_array($int, preg_split('/[ |,]+/', $group['members']))) {
                 $result[$group['ifname']] = $int;
             }
         }