diff --git a/packages/datalib/src/GridConfig.ts b/packages/datalib/src/GridConfig.ts
index 6bee44f54..62f1d920f 100644
--- a/packages/datalib/src/GridConfig.ts
+++ b/packages/datalib/src/GridConfig.ts
@@ -5,11 +5,11 @@ export interface GridConfigColumns {
   hiddenColumns: string[];
   expandedColumns: string[];
   addedColumns: string[];
-  focusedColumn?: string;
 }
 
 export interface GridConfig extends GridConfigColumns {
   filters: { [uniqueName: string]: string };
+  focusedColumn?: string;
   sort: {
     uniqueName: string;
     order: 'ASC' | 'DESC';
diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index c6f127168..155db847b 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -81,7 +81,7 @@ export abstract class GridDisplay {
   }
 
   get allColumns() {
-    return this.columns;
+    return this.getColumns(null).filter((col) => col.isChecked || col.uniquePath.length == 1);
   }
 
   reload() {
diff --git a/packages/web/src/datagrid/ColumnManager.js b/packages/web/src/datagrid/ColumnManager.js
index f869bded0..ac9e72ad0 100644
--- a/packages/web/src/datagrid/ColumnManager.js
+++ b/packages/web/src/datagrid/ColumnManager.js
@@ -54,12 +54,9 @@ function ColumnManagerRow(props) {
   const { display, column } = props;
   const [isHover, setIsHover] = React.useState(false);
   return (
-    <Row
-      onMouseEnter={() => setIsHover(true)}
-      onMouseLeave={() => setIsHover(false)}
-      onClick={() => display.focusColumn(column.uniqueName)}
-    >
+    <Row onMouseEnter={() => setIsHover(true)} onMouseLeave={() => setIsHover(false)}>
       <ExpandIcon
+        // className="expandColumnIcon"
         isBlank={!column.foreignKey}
         isExpanded={column.foreignKey && display.isExpandedColumn(column.uniqueName)}
         isSelected={isHover}
@@ -71,7 +68,11 @@ function ColumnManagerRow(props) {
         checked={column.isChecked}
         onChange={() => display.setColumnVisibility(column.uniquePath, !column.isChecked)}
       ></input>
-      <ColumnLabel {...column} />
+      <ColumnLabel
+        {...column}
+        // @ts-ignore
+        onClick={() => display.focusColumn(column.uniqueName)}
+      />
     </Row>
   );
 }
diff --git a/packages/web/src/datagrid/SeriesSizes.ts b/packages/web/src/datagrid/SeriesSizes.ts
index 14e016f1c..1f88eae0d 100644
--- a/packages/web/src/datagrid/SeriesSizes.ts
+++ b/packages/web/src/datagrid/SeriesSizes.ts
@@ -64,6 +64,7 @@ export class SeriesSizes {
     this.scrollItems = [];
     this.scrollIndexes = _.filter(
       _.map(_.range(this.count), (x) => this.modelToReal(x) - this.frozenCount),
+      // _.map(this.intKeys(_.keys(this.sizeOverridesByModelIndex)), (x) => this.modelToReal(x) - this.frozenCount),
       (x) => x >= 0
     );
     this.scrollIndexes.sort();