diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index 8bcacec7d..6bcb59f04 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -100,9 +100,6 @@ describe('Data browser data', () => {
 
   it('Data grid screenshots', () => {
     cy.contains('MySql-connection').click();
-    cy.window().then(win => {
-      win.__changeCurrentTheme('theme-dark');
-    });
 
     cy.contains('MyChinook').click();
 
@@ -129,6 +126,15 @@ describe('Data browser data', () => {
     cy.themeshot('data-browser-form-view');
   });
 
+  it.only('Column search', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.contains('Customer').click();
+    cy.testid('ColumnManager_searchColumns').clear().type('name,id{enter}');
+    cy.contains('Company').should('not.exist');
+    cy.themeshot('data-browser-column-search');
+  });
+
   it('SQL Gen', () => {
     cy.contains('Postgres-connection').click();
     cy.contains('PgChinook').rightclick();
diff --git a/packages/web/src/datagrid/ColumnManager.svelte b/packages/web/src/datagrid/ColumnManager.svelte
index ef0e1906b..fbc024457 100644
--- a/packages/web/src/datagrid/ColumnManager.svelte
+++ b/packages/web/src/datagrid/ColumnManager.svelte
@@ -178,6 +178,7 @@
     placeholder="Search columns"
     value={currentFilter}
     onChange={value => display.setSearchInColumns(value)}
+    data-testid="ColumnManager_searchColumns"
   />
   <CloseSearchButton filter={currentFilter} onClearFilter={() => display.setSearchInColumns('')} />
   {#if isDynamicStructure && !isJsonView}