diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index 5243f4967..752628c8d 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -71,7 +71,8 @@ export abstract class GridDisplay {
     protected setCache: ChangeCacheFunc,
     public driver?: EngineDriver,
     public dbinfo: DatabaseInfo = null,
-    public serverVersion = null
+    public serverVersion = null,
+    public currentSettings = null
   ) {
     this.dialect = (driver?.dialectByVersion && driver?.dialectByVersion(serverVersion)) || driver?.dialect;
   }
@@ -206,7 +207,7 @@ export abstract class GridDisplay {
   get hiddenColumnIndexes() {
     // console.log('GridDisplay.hiddenColumn', this.config.hiddenColumns);
     const res = (this.config.hiddenColumns || []).map(x => _.findIndex(this.allColumns, y => y.uniqueName == x));
-    if (this.config.searchInColumns) {
+    if (this.config.searchInColumns && !this.currentSettings?.['dataGrid.showAllColumnsWhenSearch']) {
       for (let i = 0; i < this.allColumns.length; i++) {
         if (!filterName(this.config.searchInColumns, this.allColumns[i].columnName)) {
           res.push(i);
diff --git a/packages/datalib/src/TableGridDisplay.ts b/packages/datalib/src/TableGridDisplay.ts
index bc517d96e..bfdd27696 100644
--- a/packages/datalib/src/TableGridDisplay.ts
+++ b/packages/datalib/src/TableGridDisplay.ts
@@ -38,9 +38,10 @@ export class TableGridDisplay extends GridDisplay {
     serverVersion,
     public getDictionaryDescription: DictionaryDescriptionFunc = null,
     isReadOnly = false,
-    public isRawMode = false
+    public isRawMode = false,
+    public currentSettings = null
   ) {
-    super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
+    super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion, currentSettings);
 
     this.table = this.findTable(tableName);
     if (!this.table) {
diff --git a/packages/web/src/datagrid/TableDataGrid.svelte b/packages/web/src/datagrid/TableDataGrid.svelte
index 4573186ad..2aebada65 100644
--- a/packages/web/src/datagrid/TableDataGrid.svelte
+++ b/packages/web/src/datagrid/TableDataGrid.svelte
@@ -20,6 +20,7 @@
     useDatabaseInfo,
     useDatabaseServerVersion,
     useServerVersion,
+    useSettings,
     useUsedApps,
   } from '../utility/metadataLoaders';
 
@@ -55,6 +56,7 @@
   $: apps = useUsedApps();
   $: extendedDbInfo = extendDatabaseInfoFromApps($dbinfo, $apps);
   $: connections = useConnectionList();
+  const settingsValue = useSettings();
 
   // $: console.log('serverVersion', $serverVersion);
 
@@ -76,7 +78,8 @@
           $serverVersion,
           table => getDictionaryDescription(table, conid, database, $apps, $connections),
           forceReadOnly || $connection?.isReadOnly,
-          isRawMode
+          isRawMode,
+          $settingsValue
         )
       : null;
 
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 6e66932ab..ee00249aa 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -192,6 +192,8 @@ ORDER BY
             ]}
           />
 
+          <FormCheckboxField name="dataGrid.showAllColumnsWhenSearch" label="Show all columns when searching" defaultValue={false} />
+
           <div class="heading">SQL editor</div>
 
           <div class="flex">