diff --git a/src/components/cards/CardsOverview.svelte b/src/components/cards/CardsOverview.svelte
index 04f6e461..2463b772 100644
--- a/src/components/cards/CardsOverview.svelte
+++ b/src/components/cards/CardsOverview.svelte
@@ -23,7 +23,7 @@
   import CardStatus from "./CardStatus.svelte";
   import CardRunner from "./CardRunner.svelte";
   import { onMount } from "svelte";
-  import { runnerFilter } from "../shared/tablefilters";
+  import { runnerFilter, statusFilter } from "../shared/tablefilters";
   import DeleteCardModal from "./DeleteCardModal.svelte";
 
   export let edit_modal_open = false;
@@ -61,7 +61,7 @@
         return renderComponent(CardStatus, { enabled: info.getValue() });
       },
       header: () => $_("status"),
-      filterFn: `includesString`,
+      filterFn: `status`,
     },
     {
       accessorKey: "actions",
@@ -100,6 +100,7 @@
     },
     filterFns: {
       runner: runnerFilter,
+      status: statusFilter,
     },
     enableRowSelection: true,
     getCoreRowModel: getCoreRowModel(),
diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte
index b8e6af9b..94e78d09 100644
--- a/src/components/scans/ScansOverview.svelte
+++ b/src/components/scans/ScansOverview.svelte
@@ -19,7 +19,7 @@
   import ScansEmptyState from "./ScansEmptyState.svelte";
   import InputElement from "../shared/InputElement.svelte";
   import TableActions from "../shared/TableActions.svelte";
-  import { runnerFilter } from "../shared/tablefilters";
+  import { runnerFilter, statusFilter } from "../shared/tablefilters";
   import CardRunner from "../cards/CardRunner.svelte";
   import ScanValid from "./ScanValid.svelte";
 
@@ -113,7 +113,7 @@
         return renderComponent(ScanValid, { valid: info.getValue() });
       },
       header: () => $_("status"),
-      filterFn: `includesString`,
+      filterFn: `status`,
     },
     {
       accessorKey: "actions",
@@ -145,6 +145,7 @@
     },
     filterFns: {
       runner: runnerFilter,
+      status: statusFilter,
     },
     enableRowSelection: true,
     getCoreRowModel: getCoreRowModel(),
diff --git a/src/components/shared/tablefilters.js b/src/components/shared/tablefilters.js
index 3cf65a88..1a26b2cf 100644
--- a/src/components/shared/tablefilters.js
+++ b/src/components/shared/tablefilters.js
@@ -26,4 +26,9 @@ export const runnerFilter = (row, columnId, value) => {
         return `${runner.firstname} ${runner.middlename} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
     }
     return `${runner.firstname} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
+};
+
+export const statusFilter = (row, columnId, value) => {
+    const status = row.getValue(columnId);
+    return status.toString().includes(value);
 };
\ No newline at end of file