diff --git a/superset-frontend/src/explore/components/DatasourcePanel.tsx b/superset-frontend/src/explore/components/DatasourcePanel.tsx
index 143550c276..661b0f46dc 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel.tsx
@@ -104,6 +104,7 @@ export default function DataSourcePanel({
   actions,
 }: Props) {
   const { columns, metrics } = datasource;
+  const [inputValue, setInputValue] = useState('');
   const [lists, setList] = useState({
     columns,
     metrics,
@@ -168,6 +169,7 @@ export default function DataSourcePanel({
       columns,
       metrics,
     });
+    setInputValue('');
   }, [columns, datasource, metrics]);
 
   const metricSlice = lists.metrics.slice(0, 50);
@@ -178,8 +180,10 @@ export default function DataSourcePanel({
       <input
         type="text"
         onChange={evt => {
+          setInputValue(evt.target.value);
           search(evt.target.value);
         }}
+        value={inputValue}
         className="form-control input-md"
         placeholder={t('Search Metrics & Columns')}
       />