diff --git a/src/renderer/components/WorkspaceQueryTab.vue b/src/renderer/components/WorkspaceQueryTab.vue
index 90bd30c8..051a3fe9 100644
--- a/src/renderer/components/WorkspaceQueryTab.vue
+++ b/src/renderer/components/WorkspaceQueryTab.vue
@@ -8,6 +8,7 @@
                   class="btn btn-link btn-sm"
                   :class="{'loading':isQuering}"
                   :disabled="!query"
+                  title="F9"
                   @click="runQuery(query)"
                >
                   <span>{{ $t('word.run') }}</span>
@@ -81,6 +82,12 @@ export default {
          return this.getWorkspace(this.connection.uid);
       }
    },
+   created () {
+      window.addEventListener('keydown', this.onKey);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
    methods: {
       ...mapActions({
          addNotification: 'notifications/addNotification',
@@ -103,7 +110,7 @@ export default {
          return [];
       },
       async runQuery (query) {
-         if (!query) return;
+         if (!query || this.isQuering) return;
          this.isQuering = true;
          this.clearTabData();
 
@@ -217,6 +224,11 @@ export default {
          this.resultsCount = false;
          this.affectedCount = false;
          this.setTabFields({ cUid: this.connection.uid, tUid: this.tabUid, fields: [] });
+      },
+      onKey (e) {
+         e.stopPropagation();
+         if (e.key === 'F9')
+            this.runQuery(this.query);
       }
    }
 };
diff --git a/src/renderer/components/WorkspaceTableTab.vue b/src/renderer/components/WorkspaceTableTab.vue
index 8d25bd1e..1b367272 100644
--- a/src/renderer/components/WorkspaceTableTab.vue
+++ b/src/renderer/components/WorkspaceTableTab.vue
@@ -6,6 +6,7 @@
                <button
                   class="btn btn-link btn-sm"
                   :class="{'loading':isQuering}"
+                  title="F5"
                   @click="reloadTable"
                >
                   <span>{{ $t('word.refresh') }}</span>
@@ -108,6 +109,10 @@ export default {
    },
    created () {
       this.getTableData();
+      window.addEventListener('keydown', this.onKey);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
    },
    methods: {
       ...mapActions({
@@ -176,13 +181,18 @@ export default {
          return this.table;
       },
       reloadTable () {
-         this.getTableData();
+         if (!this.isQuering) this.getTableData();
       },
       showAddModal () {
          this.isAddModal = true;
       },
       hideAddModal () {
          this.isAddModal = false;
+      },
+      onKey (e) {
+         e.stopPropagation();
+         if (e.key === 'F5')
+            this.reloadTable();
       }
    }
 };