diff --git a/src/views/QueryEditor/QueryEditor.tsx b/src/views/QueryEditor/QueryEditor.tsx
index bf78415f3..1fa6045d5 100644
--- a/src/views/QueryEditor/QueryEditor.tsx
+++ b/src/views/QueryEditor/QueryEditor.tsx
@@ -69,7 +69,7 @@ export function QueryEditor(props: QueryEditorProps<CHDataSource, CHQuery, CHDat
             query={initializedQuery}
             height={200}
             onSqlChange={onSqlChange}
-            onRunQuery={onRunQuery}
+            onRunQuery={onTriggerQuery}
             onFieldChange={onFieldChange}
             formattedData={formattedData}
             datasource={datasource}
diff --git a/src/views/QueryEditor/components/QueryTextEditor/SQLCodeEditor.tsx b/src/views/QueryEditor/components/QueryTextEditor/SQLCodeEditor.tsx
index 323c2b924..728ec09e7 100644
--- a/src/views/QueryEditor/components/QueryTextEditor/SQLCodeEditor.tsx
+++ b/src/views/QueryEditor/components/QueryTextEditor/SQLCodeEditor.tsx
@@ -17,7 +17,7 @@ export const SQLCodeEditor = ({ query, onSqlChange, onRunQuery, datasource }: an
   }
 
   return (
-    <div style={{ position: 'relative', width: '100%', marginTop: '10px'}}  onBlur={onRunQuery}>
+    <div style={{ position: 'relative', width: '100%', marginTop: '10px'}} >
       <CodeEditor
         height={Math.max(query.query.split('\n').length * 18, 150)}
         value={query.query}
@@ -32,6 +32,7 @@ export const SQLCodeEditor = ({ query, onSqlChange, onRunQuery, datasource }: an
           }, 10)
         }}
         onChange={onSqlChange}
+        onBlur={onRunQuery}
       />
     </div>
   );