diff --git a/packages/web/src/celldata/TableCellView.svelte b/packages/web/src/celldata/TableCellView.svelte
index a2f022552..0c97a6c95 100644
--- a/packages/web/src/celldata/TableCellView.svelte
+++ b/packages/web/src/celldata/TableCellView.svelte
@@ -9,6 +9,9 @@
   import EditCellDataModal from '../modals/EditCellDataModal.svelte';
   import ShowFormButton from '../formview/ShowFormButton.svelte';
   import { openJsonDocument } from '../tabs/JsonTab.svelte';
+  import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
+  import SearchInput from '../elements/SearchInput.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
 
   export let selection;
 
@@ -20,6 +23,8 @@
   $: realColumnUniqueNames = selection?.realColumnUniqueNames || [];
   $: setCellValue = selection?.setCellValue;
 
+  let filter = '';
+
   $: orderedFields = realColumnUniqueNames
     .map(colName => {
       const col = columns.find(c => c.uniqueName === colName);
@@ -34,6 +39,16 @@
     })
     .filter(Boolean);
 
+  $: filteredFields = orderedFields.filter(field => {
+    if (!filter) return true;
+    try {
+      const regex = new RegExp(filter, 'i');
+      return regex.test(field.columnName);
+    } catch (e) {
+      return field.columnName.toLowerCase().includes(filter.toLowerCase());
+    }
+  });
+
   let editingColumn = null;
   let editValue = '';
   let domEditor = null;
@@ -102,12 +117,12 @@
   }
 
   function moveToNextField(field, reverse) {
-    const currentIndex = orderedFields.findIndex(f => f.uniqueName === field.uniqueName);
+    const currentIndex = filteredFields.findIndex(f => f.uniqueName === field.uniqueName);
     const nextIndex = reverse ? currentIndex - 1 : currentIndex + 1;
-    if (nextIndex < 0 || nextIndex >= orderedFields.length) return;
+    if (nextIndex < 0 || nextIndex >= filteredFields.length) return;
     
     tick().then(() => {
-      const nextField = orderedFields[nextIndex];
+      const nextField = filteredFields[nextIndex];
       if (isJsonValue(nextField.value)) {
         openEditModal(nextField);
       } else {
@@ -116,6 +131,14 @@
     });
   }
 
+  function handleSearchKeyDown(e) {
+    if (e.keyCode === keycodes.backspace && (e.metaKey || e.ctrlKey)) {
+      filter = '';
+      e.stopPropagation();
+      e.preventDefault();
+    }
+  }
+
   function handleBlur(field) {
     if (isChangedRef.get()) {
       saveValue(field);
@@ -152,11 +175,19 @@
 </script>
 
 <div class="outer">
+  {#if rowData}
+    <div class="search-wrapper" on:keydown={handleSearchKeyDown}>
+      <SearchBoxWrapper noMargin>
+        <SearchInput placeholder="Filter columns (regex)" bind:value={filter} />
+        <CloseSearchButton bind:filter />
+      </SearchBoxWrapper>
+    </div>
+  {/if}
   <div class="inner">
     {#if !rowData}
       <div class="no-data">No data selected</div>
     {:else}
-      {#each orderedFields as field (field.uniqueName)}
+      {#each filteredFields as field (field.uniqueName)}
         <div class="field">
           <div class="field-name">{field.columnName}</div>
           <div 
@@ -210,15 +241,17 @@
   .outer {
     flex: 1;
     position: relative;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .search-wrapper {
+    padding: 4px 4px 0 4px;
   }
 
   .inner {
     overflow: auto;
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
+    flex: 1;
     padding: 4px;
   }