diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml
index 957373448..53894f519 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml
@@ -31,7 +31,9 @@
     <field>
         <id>rule.source</id>
         <label>source</label>
-        <type>text</type>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
         <help>source ip or network, examples 10.0.0.0/24, 10.0.0.1</help>
     </field>
     <field>
@@ -49,7 +51,9 @@
     <field>
         <id>rule.destination</id>
         <label>destination</label>
-        <type>text</type>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
         <help>destination ip or network, examples 10.0.0.0/24, 10.0.0.1</help>
     </field>
     <field>
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index af708872c..a8b458acc 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -277,6 +277,7 @@
                     <Required>Y</Required>
                     <FieldSeparator>,</FieldSeparator>
                     <default>any</default>
+                    <asList>Y</asList>
                 </source>
                 <source_not type="BooleanField">
                     <default>0</default>
@@ -291,6 +292,7 @@
                     <Required>Y</Required>
                     <FieldSeparator>,</FieldSeparator>
                     <default>any</default>
+                    <asList>Y</asList>
                 </destination>
                 <destination_not type="BooleanField">
                     <default>0</default>