diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 77b17086c4..7736f1f248 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -266,13 +266,16 @@
 <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p>
 <p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p>
 
-<table>
+<table id="table_marcsubfieldstructure">
+    <thead>
 <tr>
     <th>Subfield</th>
     <th>Text</th>
     <th>Constraints</th>
-    <th>Actions</th>
+    <th class="NoSort">Actions</th>
 </tr>
+    </thead>
+    <tbody>
 [% FOREACH loo IN loop %]
 <tr>
     <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field">[% loo.tagsubfield | html %]</a></td>
@@ -307,6 +310,7 @@
     </td>
 </tr>
 [% END %]
+    </tbody>
 </table>
 
 <form action="[% script_name | html %]" method="get">
@@ -331,6 +335,7 @@
      </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
+    [% INCLUDE 'datatables.inc' %]
     [% Asset.js("js/admin-menu.js") | $raw %]
     [% Asset.js("js/marc_subfields_structure.js") | $raw %]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js
index 1f1cc909e1..aa90be610a 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js
@@ -1,10 +1,16 @@
+/* global dataTablesDefaults */
 $(document).ready(function() {
     $('#subfieldtabs').tabs();
     $("input[id^='hidden_']").click(setHiddenValue);
     $("input[id^='hidden-']").each(function() {
         populateHiddenCheckboxes($(this).attr('id').split('-')[1]);
     });
-
+    $("#table_marcsubfieldstructure").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "columnDefs": [
+            { 'sortable': false, 'targets': [ 'NoSort' ] }
+        ],
+        paginate: false
+    }));
 });
 
 /* Function to enable/disable hidden values checkboxes when Flag is (de)selected */