diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html
index e8178fe7a..325980f83 100644
--- a/plinth/modules/firewall/templates/firewall.html
+++ b/plinth/modules/firewall/templates/firewall.html
@@ -47,7 +47,6 @@
           </thead>
 
           <tbody>
-            {% for service in services %}
               <tr>
                 <td><strong>{{ service.name }}</strong></td>
                 <td>
@@ -62,6 +61,7 @@
               </tr>
 
               {% for port in service.ports %}
+            {% for service in services|dictsort:"name" %}
                 <tr>
                   <td class='cell-indented'><em>{{ port }}</em></td>
                   <td>