diff --git a/superset-frontend/src/explore/components/DatasourcePanel.tsx b/superset-frontend/src/explore/components/DatasourcePanel.tsx
index cc1129eaf1d..f961efad3c4 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel.tsx
@@ -191,22 +191,9 @@ const DataSourcePanel = ({
         />
         <Collapse
           bordered={false}
-          defaultActiveKey={['column', 'metrics']}
+          defaultActiveKey={['metrics', 'column']}
           expandIconPosition="right"
         >
-          <Collapse.Panel
-            header={<span className="header">{t('Columns')}</span>}
-            key="column"
-          >
-            <div className="field-length">
-              {t(`Showing %s of %s`, columnSlice.length, columns.length)}
-            </div>
-            {columnSlice.map(col => (
-              <div key={col.column_name} className="column">
-                <ColumnOption column={col} showType />
-              </div>
-            ))}
-          </Collapse.Panel>
           <Collapse.Panel
             header={<span className="header">{t('Metrics')}</span>}
             key="metrics"
@@ -220,6 +207,19 @@ const DataSourcePanel = ({
               </div>
             ))}
           </Collapse.Panel>
+          <Collapse.Panel
+            header={<span className="header">{t('Columns')}</span>}
+            key="column"
+          >
+            <div className="field-length">
+              {t(`Showing %s of %s`, columnSlice.length, columns.length)}
+            </div>
+            {columnSlice.map(col => (
+              <div key={col.column_name} className="column">
+                <ColumnOption column={col} showType />
+              </div>
+            ))}
+          </Collapse.Panel>
         </Collapse>
       </div>
     </DatasourceContainer>