diff --git a/packages/documentation/src/Components/Table.stories.tsx b/packages/documentation/src/Components/Table.stories.tsx
index 1b30cd53..7e1f3725 100644
--- a/packages/documentation/src/Components/Table.stories.tsx
+++ b/packages/documentation/src/Components/Table.stories.tsx
@@ -330,7 +330,7 @@ export const WithRowNumbers: Story<any> = (args) => {
 
 export const Sortable: Story<any> = (args) => {
 	const [sortState, setSortState] = useState<{
-		cell: string | number;
+		cell: string;
 		direction:
 			| typeof TableCellSortDirections.ASC
 			| typeof TableCellSortDirections.DESC
diff --git a/packages/ui-components/src/components/private/ButtonSort.tsx b/packages/ui-components/src/components/private/ButtonSort.tsx
index 7ec6282f..23506a0d 100644
--- a/packages/ui-components/src/components/private/ButtonSort.tsx
+++ b/packages/ui-components/src/components/private/ButtonSort.tsx
@@ -58,10 +58,10 @@ export const ButtonSort = React.forwardRef<HTMLButtonElement, ButtonSortProps>(
 			? clsx(
 					"relative",
 					"focus-within:static",
+					"focus-within:after:border-transparent",
 					"after:absolute",
 					"after:content-['']",
 					"after:border-b-2",
-					"after:z-[-1px]",
 					"after:bottom-[-4px]",
 					"after:left-0",
 					"after:right-0",
diff --git a/packages/ui-components/src/components/private/__tests__/ButtonSort.test.tsx b/packages/ui-components/src/components/private/__tests__/ButtonSort.test.tsx
index bb1acbbd..95f08d9b 100644
--- a/packages/ui-components/src/components/private/__tests__/ButtonSort.test.tsx
+++ b/packages/ui-components/src/components/private/__tests__/ButtonSort.test.tsx
@@ -192,10 +192,10 @@ describe("ButtonSort modifiers", () => {
 		if (parent) {
 			expectToHaveClasses(parent, [
 				"focus-within:static",
+				"focus-within:after:border-transparent",
 				"after:absolute",
 				"after:content-['']",
 				"after:border-b-2",
-				"after:z-[-1px]",
 				"after:bottom-[-4px]",
 				"after:left-0",
 				"after:right-0",
@@ -217,10 +217,10 @@ describe("ButtonSort modifiers", () => {
 		if (parent) {
 			expectToHaveClasses(parent, [
 				"focus-within:static",
+				"focus-within:after:border-transparent",
 				"after:absolute",
 				"after:content-['']",
 				"after:border-b-2",
-				"after:z-[-1px]",
 				"after:bottom-[-4px]",
 				"after:left-0",
 				"after:right-0",