diff --git a/src/client/components/elements/ColumnSelector/getInitialState.js b/src/client/components/elements/ColumnSelector/getInitialState.js
index a7ec04dc30..fd394973cd 100644
--- a/src/client/components/elements/ColumnSelector/getInitialState.js
+++ b/src/client/components/elements/ColumnSelector/getInitialState.js
@@ -1,10 +1,12 @@
 const getInitialColumnState = (fields, useAsTitle, defaultColumns) => {
   let initialColumns = [];
 
-  const hasThumbnail = fields.find(field => field.type === 'thumbnail');
+  const hasThumbnail = fields.find((field) => field.type === 'thumbnail');
 
-  if (Array.isArray(defaultColumns)) {
-    initialColumns = defaultColumns;
+  if (Array.isArray(defaultColumns) && defaultColumns.length >= 1) {
+    return {
+      columns: defaultColumns,
+    };
   }
 
   if (hasThumbnail) {
@@ -15,11 +17,8 @@ const getInitialColumnState = (fields, useAsTitle, defaultColumns) => {
     initialColumns.push(useAsTitle);
   }
 
-  const remainingColumns = fields.filter((field) => {
-    return field.name !== useAsTitle && field.type !== 'thumbnail';
-  }).slice(0, 3 - initialColumns.length).map((field) => {
-    return field.name;
-  });
+  const remainingColumns = fields.filter((field) => field.name !== useAsTitle && field.type !== 'thumbnail')
+    .slice(0, 3 - initialColumns.length).map((field) => field.name);
 
   initialColumns = initialColumns.concat(remainingColumns);