diff --git a/backend/device_registry/templates/device_info_security.html b/backend/device_registry/templates/device_info_security.html
index 6bb8f96f7..6f8d26545 100644
--- a/backend/device_registry/templates/device_info_security.html
+++ b/backend/device_registry/templates/device_info_security.html
@@ -232,7 +232,7 @@ <h5>OpenSSH</h5>
                   </th>
                   <td>
                     {% if has_global_policy %}
-                      <table class="table table-borderless table-sm">
+                      <table id="firewall-ports-table" class="table table-borderless table-sm">
                         <thead class="thead-light">
                         <tr>
                           <th scope="col">IP</th>
@@ -269,10 +269,12 @@ <h5>OpenSSH</h5>
                         <div class="form-group">
                           {% if ports_choices %}
                             <div class="table-responsive" id="ports-table">
-                              <table class="table table-borderless table-sm">
+                              <table  id="firewall-ports-table" class="table table-borderless table-sm">
                                 <thead class="thead-light">
                                 <tr>
-                                  <th scope="col" width="5%"><span
+                                  <th scope="col" width="5%" nowrap>
+                                  <input type="checkbox" value="0"  id="ports-check-all">
+                                      <span
                                       id="ports-table-column-1">{% if firewall.policy == 1 %}
                                     Blocked{% elif firewall.policy == 2 %}Allowed{% endif %}</span></th>
                                   <th scope="col">IP</th>
@@ -350,10 +352,12 @@ <h5>OpenSSH</h5>
                           {% csrf_token %}
                           <div class="form-group">
                             <div class="table-responsive">
-                              <table class="table table-borderless table-sm">
+                              <table class="table table-borderless table-sm" id="connections-table">
                                 <thead class="thead-light">
                                 <tr>
-                                  <th scope="col" width="5%">Blocked</th>
+                                  <th scope="col" width="5%" nowrap>
+                                      <input type="checkbox" value="0"  id="connections-check-all">
+                                      Blocked</th>
                                   <th scope="col">IP</th>
                                   <th scope="col">Rem addr</th>
                                   <th scope="col">Rem port</th>
@@ -436,10 +440,9 @@ <h5>OpenSSH</h5>
 
 {% block scripts %}
   <script>
-      $(function () {
-          $('[data-toggle="popover"]').popover({
-              html: true
-          })
+    $(() => {
+      $('[data-toggle="popover"]').popover({
+          html: true
       });
 
       $('#id_policy').on('change', function () {
@@ -451,6 +454,32 @@ <h5>OpenSSH</h5>
           } else if (this.value === '2') {
               $('#ports-table-column-1').text('Allowed');
           }
+          updateCheckAll('#ports-check-all', '#ports-table');
       });
+
+      function updateCheckAll(checkbox, table) {
+          let value = $(checkbox).prop('checked');
+          if(value && $(table + ' .list-unstyled:checkbox:unchecked').length > 0)
+              value = false;
+          else if(!value && $(table + ' .list-unstyled:checkbox:unchecked').length==0)
+              value = true;
+          $(checkbox).prop('checked', value);
+      }
+
+      function setupCheckAll(checkbox, table) {
+          $(checkbox).change((e) => {
+              $(table + ' :checkbox').each((i,el) => {
+                  el.checked = e.target.checked;
+              });
+          });
+          $(table + ' :checkbox').change(() => updateCheckAll(checkbox, table));
+
+          updateCheckAll(checkbox, table);
+      }
+      setupCheckAll('#ports-check-all', '#ports-table');
+      setupCheckAll('#connections-check-all', '#connections-table');
+
+    });
+
   </script>
 {% endblock %}
diff --git a/backend/device_registry/tests/test_all.py b/backend/device_registry/tests/test_all.py
index c5c6980fe..03f9164b6 100644
--- a/backend/device_registry/tests/test_all.py
+++ b/backend/device_registry/tests/test_all.py
@@ -529,8 +529,7 @@ def test_open_ports(self):
         response = self.client.get(self.url2)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'Firewall Ports Policy')
-        self.assertContains(response, '<th scope="col" width="5%"><span\n                                      '
-                                      'id="ports-table-column-1">Allowed</span></th>')
+        self.assertInHTML('<span id="ports-table-column-1">Allowed</span>', response.rendered_content)
 
     def test_open_ports_global_policy(self):
         self.client.login(username='test', password='123')
@@ -562,7 +561,7 @@ def test_open_connections(self):
         self.assertListEqual(portscan.block_networks, [['192.168.1.177', False]])
         response = self.client.get(self.url2)
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, '<th scope="col" width="5%">Blocked</th>')
+        self.assertInHTML('<input type="checkbox" value="0" id="connections-check-all">Blocked', response.rendered_content)
 
     def test_open_connections_global_policy(self):
         self.client.login(username='test', password='123')