diff --git a/web-console/src/components/sql-control/sql-control.tsx b/web-console/src/components/sql-control/sql-control.tsx
index a473aad4ba3..a3acae819f2 100644
--- a/web-console/src/components/sql-control/sql-control.tsx
+++ b/web-console/src/components/sql-control/sql-control.tsx
@@ -25,6 +25,7 @@ import {
   Popover,
   Position, ResizeSensor
 } from '@blueprintjs/core';
+import { Hotkey, Hotkeys, HotkeysTarget } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import axios from 'axios';
 import * as ace from 'brace';
@@ -77,6 +78,7 @@ export interface SqlControlState {
   editorHeight: number;
 }
 
+@HotkeysTarget
 export class SqlControl extends React.Component<SqlControlProps, SqlControlState> {
   constructor(props: SqlControlProps, context: any) {
     super(props, context);
@@ -303,6 +305,18 @@ export class SqlControl extends React.Component<SqlControlProps, SqlControlState
     </Menu>;
   }
 
+  public renderHotkeys() {
+    return <Hotkeys>
+      <Hotkey
+        allowInInput
+        global
+        combo="ctrl + enter"
+        label="run on click"
+        onKeyDown={this.onRunClick}
+      />
+    </Hotkeys>;
+  }
+
   render() {
     const { queryElapsed } = this.props;
     const { query, autoComplete, wrapQuery, editorHeight } = this.state;
diff --git a/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap b/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap
index f6775145f43..68411a1fa7e 100644
--- a/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap
+++ b/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap
@@ -16,7 +16,7 @@ exports[`describe sql view sql view snapshot 1`] = `
   <div
     className="top-pane"
   >
-    <SqlControl
+    <HotkeysTarget(SqlControl)
       initSql="test"
       onExplain={[Function]}
       onRun={[Function]}
diff --git a/web-console/tsconfig.json b/web-console/tsconfig.json
index 6c1b4c96fa5..2747778c354 100644
--- a/web-console/tsconfig.json
+++ b/web-console/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "experimentalDecorators": true,
     "noImplicitAny": true,
     "noEmitOnError": true,
     "declaration": false,