diff --git a/ChangeLog b/ChangeLog
index 3473b6b289..2a2c1382ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -112,6 +112,8 @@ phpMyAdmin - ChangeLog
 - issue #16871 Fixed PHP and JS errors on normalization steps
 - issue        Fixed CSS missing classes on normalization buttons
 - issue #16437 Fixed sticky top position when using smaller screen sizes
+- issue #16895 Fixed wrong table count on space separated numbers
+- issue #16882 Fixed table delete resets count to 0
 
 5.1.0 (2021-02-24)
 - issue #15350 Change Media (MIME) type references to Media type
diff --git a/js/src/database/structure.js b/js/src/database/structure.js
index c811c911a4..9310f9d64f 100644
--- a/js/src/database/structure.js
+++ b/js/src/database/structure.js
@@ -70,7 +70,7 @@ DatabaseStructure.adjustTotals = function () {
             // The approximated value contains a preceding ~ (Eg 100 --> ~100)
             strRows = strRows.substring(1, strRows.length);
         }
-        strRows = strRows.replace(/[,.]/g, '');
+        strRows = strRows.replace(/[,.\s]/g, '');
         var intRow = parseInt(strRows, 10);
         if (! isNaN(intRow)) {
             rowsSum += intRow;
diff --git a/templates/database/structure/table_header.twig b/templates/database/structure/table_header.twig
index 87d7738ed8..f13ad94a55 100644
--- a/templates/database/structure/table_header.twig
+++ b/templates/database/structure/table_header.twig
@@ -1,7 +1,7 @@
 <form method="post" action="{{ url('/database/structure') }}" name="tablesForm" id="tablesForm">
 {{ get_hidden_inputs(db) }}
 <div class="table-responsive">
-<table class="table table-light table-striped table-hover table-sm w-auto">
+<table class="table table-light table-striped table-hover table-sm w-auto data">
     <thead class="table-light">
         <tr>
             <th class="d-print-none"></th>