diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index 2a22236474..baa84c91e0 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -370,12 +370,8 @@
                 class:spectrum-Table-cell--divider={!!schema[field].divider}
                 style={cellStyles[field]}
                 on:click={() => {
-                  if (!field.startsWith("custom-")) {
+                  if (!schema[field]?.preventSelectRow) {
                     dispatch("click", row)
-                  }
-                }}
-                on:click={() => {
-                  if (!field.startsWith("custom-")) {
                     toggleSelectRow(row)
                   }
                 }}