diff --git a/ChangeLog b/ChangeLog
index a32ccd1fcc..795bf3dad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
 - issue        Fix PHP 8.2 deprecated string interpolation syntax
 - issue        Some languages are now correctly detected from the HTTP header
 - issue #17617 Sorting is correctly remembered when $cfg['RememberSorting'] is true
+- issue #17593 Table filtering now works when action buttons are on the right side of the row
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
diff --git a/js/src/sql.js b/js/src/sql.js
index aed0165529..b6ba8dd562 100644
--- a/js/src/sql.js
+++ b/js/src/sql.js
@@ -893,10 +893,11 @@ window.AJAX.registerOnload('sql.js', function () {
         var $targetTable = $('.table_results[data-uniqueId=\'' + uniqueId + '\']');
         var $headerCells = $targetTable.find('th[data-column]');
         var targetColumns = [];
-        // To handle colspan=4, in case of edit,copy etc options.
-        var dummyTh = ($('.edit_row_anchor').length !== 0 ?
-            '<th class="hide dummy_th"></th><th class="hide dummy_th"></th><th class="hide dummy_th"></th>'
-            : '');
+
+        // To handle colspan=4, in case of edit, copy, etc options (Table row links). Add 3 dummy <TH> elements - only when the Table row links are NOT on the "Right"
+        var rowLinksLocation = ($targetTable.find('thead > tr > th')).first();
+        var dummyTh = (rowLinksLocation[0].getAttribute('colspan') !== null) ? '<th class="hide dummy_th"></th><th class="hide dummy_th"></th><th class="hide dummy_th"></th>' : ''; // Selecting columns that will be considered for filtering and searching.
+
         // Selecting columns that will be considered for filtering and searching.
         $headerCells.each(function () {
             targetColumns.push($(this).text().trim());