diff --git a/templates/element/genericElements/IndexTable/headers.php b/templates/element/genericElements/IndexTable/headers.php
index 8366449..b949d12 100644
--- a/templates/element/genericElements/IndexTable/headers.php
+++ b/templates/element/genericElements/IndexTable/headers.php
@@ -21,9 +21,14 @@
                 }
 
             }
+            if (!empty($header['element']) && $header['element'] === 'selector') {
+                $columnName = 'row-selector';
+            } else {
+                $columnName = h(\Cake\Utility\Inflector::variable(!empty($header['name']) ? $header['name'] : \Cake\Utility\Inflector::humanize($header['data_path'])));
+            }
             $headersHtml .= sprintf(
                 '<th scope="col" data-columnname="%s">%s</th>',
-                h(\Cake\Utility\Inflector::variable(!empty($header['name']) ? $header['name'] : \Cake\Utility\Inflector::humanize($header['data_path']))),
+                $columnName,
                 $header_data
             );
         }
diff --git a/templates/element/genericElements/ListTopBar/group_table_action/hiddenColumns.php b/templates/element/genericElements/ListTopBar/group_table_action/hiddenColumns.php
index 5d0ce68..52c64c2 100644
--- a/templates/element/genericElements/ListTopBar/group_table_action/hiddenColumns.php
+++ b/templates/element/genericElements/ListTopBar/group_table_action/hiddenColumns.php
@@ -4,6 +4,9 @@ $tableSettings['hidden_column'] = $tableSettings['hidden_column'] ?? [];
 $availableColumnsHtml = '';
 $availableColumns = [];
 foreach ($table_data['fields'] as $field) {
+    if (!empty($field['element']) && $field['element'] === 'selector') {
+        continue;
+    }
     $fieldName = !empty($field['name']) ? $field['name'] : \Cake\Utility\Inflector::humanize($field['data_path']);
     $isVisible = !in_array(h(\Cake\Utility\Inflector::variable($fieldName)), $tableSettings['hidden_column']);
     $availableColumns[] = $fieldName;