diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ec508b1..e4b82125e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,4 +44,4 @@ All notable, unreleased changes to this project will be documented in this file.
 - Fix copy - #223, #224 by @dominik-zeglen
 - Fix ui improvements - #226 by @benekex2
 - Fix attribute errors - #216 by @dominik-zeglen
-
+- Fix column picker - #228 by @dominik-zeglen
diff --git a/src/components/ColumnPicker/ColumnPickerContent.tsx b/src/components/ColumnPicker/ColumnPickerContent.tsx
index bef6aa779..bffe1bc82 100644
--- a/src/components/ColumnPicker/ColumnPickerContent.tsx
+++ b/src/components/ColumnPicker/ColumnPickerContent.tsx
@@ -87,10 +87,11 @@ const ColumnPickerContent: React.FC<ColumnPickerContentProps> = props => {
   const anchor = React.useRef<HTMLDivElement>();
   const scrollPosition = useElementScroll(anchor);
 
-  const dropShadow = anchor.current
-    ? scrollPosition.y + anchor.current.clientHeight <
-      anchor.current.scrollHeight
-    : false;
+  const dropShadow =
+    anchor.current && scrollPosition
+      ? scrollPosition.y + anchor.current.clientHeight <
+        anchor.current.scrollHeight
+      : false;
 
   return (
     <Card className={classes.root}>