diff --git a/src/components/ColumnPicker/ColumnPicker.tsx b/src/components/ColumnPicker/ColumnPicker.tsx
index cf5cfb217..dfef82983 100644
--- a/src/components/ColumnPicker/ColumnPicker.tsx
+++ b/src/components/ColumnPicker/ColumnPicker.tsx
@@ -62,10 +62,10 @@ const ColumnPicker: React.FC<ColumnPickerProps> = props => {
     setTimeout(() => setExpansionState(initialOpen), 100);
   }, []);
 
-  const handleCancel = React.useCallback(() => {
+  const handleCancel = () => {
     setExpansionState(false);
-    setSelectedColumns(columns.map(column => column.value));
-  }, [columns]);
+    setSelectedColumns(initialColumns);
+  };
 
   const handleColumnToggle = (column: string) =>
     setSelectedColumns(toggle(column, selectedColumns, (a, b) => a === b));