diff --git a/package.json b/package.json
index 024a1ae9..ab4e600b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yattie",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "engines": {
     "npm": ">=8.0.0 <9.0.0",
     "node": ">=16.0.0 <17.0.0"
@@ -58,6 +58,7 @@
     "vue-i18n-bridge": "^9.2.0-beta.10",
     "vue-input-tag": "^2.0.7",
     "vue-router": "^3.5.1",
+    "vue-shortkey": "^3.1.7",
     "vuedraggable": "^2.24.3",
     "vuetify": "^2.6.0",
     "vuex": "^3.6.2",
diff --git a/src/components/CheckTaskWrapper.vue b/src/components/CheckTaskWrapper.vue
index bb0a0227..c29d8812 100644
--- a/src/components/CheckTaskWrapper.vue
+++ b/src/components/CheckTaskWrapper.vue
@@ -6,7 +6,11 @@
     >
       {{ $tc("caption.checklist", 1) }}
     </div>
-    <div class="list">
+    <div
+      class="list"
+      v-shortkey="checklistHotkey"
+      @shortkey="$hotkeyHelpers.focusField($refs, 'form')"
+    >
       <v-form ref="form" v-model="valid" lazy-validation>
         <div class="" v-for="task in tasks" :key="task.id">
           <v-checkbox
@@ -33,6 +37,10 @@
 export default {
   name: "CheckTaskWrapper",
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     tasks: {
       type: Array,
       default: () => [],
@@ -45,6 +53,7 @@ export default {
   data() {
     return {
       valid: true,
+      config: this.configItem,
     };
   },
   mounted() {
@@ -53,6 +62,12 @@ export default {
     });
   },
   computed: {
+    checklistHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "sessionPlanning.checklist",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -61,6 +76,11 @@ export default {
       }
     },
   },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   methods: {
     rules(required) {
       if (required) {
@@ -70,10 +90,11 @@ export default {
       }
     },
     handleValidate() {
-      const isValid = this.$refs.form.validate();
-      if (!isValid) {
-        const el = document.querySelector(".v-messages__wrapper:first-of-type");
-        el.scrollIntoView();
+      if (this.$refs.form) {
+        const isValid = this.$refs.form.validate();
+        if (!isValid) {
+          this.$refs.form.$el.scrollIntoView();
+        }
       }
     },
   },
diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index cde81b0c..dd5a2c70 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container>
     <div class="mini-ctrl-wrapper" v-if="viewMode === 'mini'">
-      <MinimizeControlWrapper
+      <!--<MinimizeControlWrapper
         :p-elapsed-time="elapsedTime"
         :p-status="status"
         @pause-session="pauseSession()"
@@ -9,13 +9,13 @@
         @end-session="endSession()"
         @start-record-video="startRecordVideo()"
         @stop-record-video="stopRecordVideo()"
-        @screenshot="screenshot()"
+        @screenshot="handleScreenshot()"
         @start-record-audio="startRecordAudio()"
         @stop-record-audio="stopRecordAudio()"
         @show-note-dialog="showNoteDialog()"
         @show-mindmap-dialog="addMindmap()"
         @show-source-picker="showSourcePickerDialog()"
-      />
+      />-->
     </div>
     <div className="nml-ctrl-wrapper" v-if="viewMode === 'normal'">
       <v-row class="text-center" v-if="status === 'pending'">
@@ -213,6 +213,8 @@
                 small
                 color="default"
                 v-on="on"
+                v-shortkey="pauseHotkey"
+                @shortkey="pauseSession()"
                 @click="pauseSession()"
               >
                 <img
@@ -241,6 +243,8 @@
                 small
                 color="default"
                 v-on="on"
+                v-shortkey="resumeHotkey"
+                @shortkey="resumeSession()"
                 @click="resumeSession()"
               >
                 <img
@@ -269,6 +273,8 @@
                 small
                 color="default"
                 v-on="on"
+                v-shortkey="stopHotkey"
+                @shortkey="endSession()"
                 @click="endSession()"
               >
                 <img
@@ -296,8 +302,10 @@
                 outlined
                 small
                 color="default"
-                v-on="on"
                 :disabled="status === 'pause'"
+                v-on="on"
+                v-shortkey="startVideoHotkey"
+                @shortkey="startRecordVideo()"
                 @click="startRecordVideo()"
               >
                 <img
@@ -325,8 +333,10 @@
                 outlined
                 small
                 color="default"
-                v-on="on"
                 :disabled="status === 'pause'"
+                v-on="on"
+                v-shortkey="stopVideoHotkey"
+                @shortkey="stopRecordVideo()"
                 @click="stopRecordVideo()"
               >
                 <img
@@ -356,7 +366,9 @@
                 color="default"
                 :disabled="status === 'pause'"
                 v-on="on"
-                @click="screenshot()"
+                v-shortkey="screenshotHotkey"
+                @shortkey="handleScreenshot()"
+                @click="handleScreenshot()"
               >
                 <img
                   v-if="$vuetify.theme.dark === false"
@@ -383,8 +395,10 @@
                 outlined
                 small
                 color="default"
-                v-on="on"
                 :disabled="status === 'pause'"
+                v-on="on"
+                v-shortkey="startAudioHotkey"
+                @shortkey="startRecordAudio()"
                 @click="startRecordAudio()"
               >
                 <img
@@ -404,6 +418,7 @@
             <span>{{ $tc("caption.start_audio_record", 1) }}</span>
           </v-tooltip>
           <v-tooltip top v-if="recordAudioStarted">
+            <!-- CTODO test same binding for start/stop -->
             <template v-slot:activator="{ on }">
               <v-btn
                 id="btn_stop_record_audio"
@@ -414,6 +429,8 @@
                 color="default"
                 v-on="on"
                 :disabled="status === 'pause'"
+                v-shortkey="stopAudioHotkey"
+                @shortkey="stopRecordAudio()"
                 @click="stopRecordAudio()"
               >
                 <img
@@ -445,7 +462,9 @@
                 color="default"
                 :disabled="status === 'pause'"
                 v-on="on"
-                @click="showNoteDialog"
+                v-shortkey="noteHotkey"
+                @shortkey="showNoteDialog()"
+                @click="showNoteDialog()"
               >
                 <img
                   v-if="$vuetify.theme.dark === false"
@@ -473,7 +492,9 @@
                 color="default"
                 :disabled="status === 'pause'"
                 v-on="on"
-                @click="addMindmap"
+                v-shortkey="mindmapHotkey"
+                @shortkey="addMindmap()"
+                @click="addMindmap()"
               >
                 <img
                   v-if="$vuetify.theme.dark === false"
@@ -491,7 +512,7 @@
             </template>
             <span>{{ $tc("caption.mind_map", 1) }}</span>
           </v-tooltip>
-          <v-tooltip top>
+          <!--<v-tooltip top>
             <template v-slot:activator="{ on }">
               <v-btn
                 class="control-btn mx-1"
@@ -517,7 +538,7 @@
               </v-btn>
             </template>
             <span>{{ $tc("caption.minimize", 1) }}</span>
-          </v-tooltip>
+          </v-tooltip>-->
           <v-menu offset-y>
             <template v-slot:activator="{ on, attrs }">
               <v-btn
@@ -529,6 +550,8 @@
                 color="default"
                 v-on="on"
                 v-bind="attrs"
+                v-shortkey="changeSourceHotkey"
+                @shortkey="showSourcePickerDialog()"
               >
                 <v-icon v-if="$vuetify.theme.dark === false">
                   mdi-dots-vertical
@@ -538,7 +561,7 @@
             </template>
             <v-list>
               <v-list-item
-                @click="showSourcePickerDialog"
+                @click="showSourcePickerDialog()"
                 :disabled="
                   status === 'pause' || recordVideoStarted || recordAudioStarted
                 "
@@ -554,11 +577,14 @@
           cols="12"
           class="d-flex justify-center px-0 pt-0"
           v-if="this.credentials.jira && this.credentials.jira.length > 0"
+          v-shortkey="createIssueHotkey"
+          @shortkey="openIssueMenu"
         >
           <v-menu
             top
             :offset-y="true"
             :close-on-content-click="false"
+            ref="issueMenu"
             v-model="issueCreateDestinationMenu"
           >
             <template v-slot:activator="{ on: issueCreateDestinationMenu }">
@@ -609,59 +635,67 @@
         :sources="sources"
         :sourceId="sourceId"
         :loaded="loaded"
+        :configItem="config"
         @submit-source="startSession"
       />
       <NoteDialog
         v-model="noteDialog"
-        @submit-note="addNote"
         :configItem="config"
         :credentialItems="credentials"
+        @submit-note="addNote"
       />
       <SummaryDialog
         v-model="summaryDialog"
-        @submit-summary="addSummary"
         :configItem="config"
         :credentialItems="credentials"
         :summary="summary"
+        @submit-summary="addSummary"
       />
       <DeleteConfirmDialog
         v-model="deleteConfirmDialog"
         :text="$t('message.confirm_delete')"
+        :configItem="config"
         @confirm="deleteItems"
         @cancel="deleteConfirmDialog = false"
       />
       <ResetConfirmDialog
         v-model="resetConfirmDialog"
         :text="$t('message.confirm_reset')"
+        :configItem="config"
         @confirm="resetSession"
         @cancel="resetConfirmDialog = false"
       />
       <SaveConfirmDialog
         v-model="saveConfirmDialog"
         :text="$t('message.confirm_session_saved')"
+        :configItem="config"
         @confirm="saveConfirmDialog = false"
       />
       <NewSessionDialog
         v-model="newSessionDialog"
         :text="$t('message.confirm_save_progress')"
+        :configItem="config"
         @save="saveSession(callback)"
         @discard="discardSession(callback)"
       />
       <DurationConfirmDialog
         v-model="durationConfirmDialog"
         :text="$t('message.confirm_proceed_session_time')"
+        :configItem="config"
         @end="end"
         @proceed="proceed"
       />
       <AudioErrorDialog
         v-model="audioErrorDialog"
         :text="$t('message.error_recording_audio')"
+        :configItem="config"
         @cancel="audioErrorDialog = false"
       />
       <EndSessionDialog
         v-model="endSessionDialog"
-        @proceed="closeEndSessionDialog"
+        :configItem="config"
         :post-session-data="postSessionData"
+        @proceed="closeEndSessionDialog"
       />
     </div>
   </v-container>
@@ -681,7 +715,7 @@ import NewSessionDialog from "./dialogs/NewSessionDialog.vue";
 import DurationConfirmDialog from "./dialogs/DurationConfirmDialog.vue";
 import AudioErrorDialog from "./dialogs/AudioErrorDialog.vue";
 import EndSessionDialog from "./dialogs/EndSessionDialog.vue";
-import MinimizeControlWrapper from "../components/MinimizeControlWrapper.vue";
+//import MinimizeControlWrapper from "../components/MinimizeControlWrapper.vue";
 
 import JiraExportSession from "./jira/JiraExportSession";
 import TestRailExportSession from "./testrail/TestRailExportSession";
@@ -721,7 +755,7 @@ export default {
     DurationConfirmDialog,
     AudioErrorDialog,
     EndSessionDialog,
-    MinimizeControlWrapper,
+    //MinimizeControlWrapper,
     JiraExportSession,
     TestRailExportSession,
     JiraAddIssue,
@@ -806,6 +840,78 @@ export default {
     },
   },
   computed: {
+    pauseHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.pause",
+        this.config.hotkeys
+      );
+    },
+    resumeHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.resume",
+        this.config.hotkeys
+      );
+    },
+    stopHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.stop",
+        this.config.hotkeys
+      );
+    },
+    startVideoHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.videoStart",
+        this.config.hotkeys
+      );
+    },
+    stopVideoHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.videoStop",
+        this.config.hotkeys
+      );
+    },
+    screenshotHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.screenshot",
+        this.config.hotkeys
+      );
+    },
+    startAudioHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.audioStart",
+        this.config.hotkeys
+      );
+    },
+    stopAudioHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.audioStop",
+        this.config.hotkeys
+      );
+    },
+    noteHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.note",
+        this.config.hotkeys
+      );
+    },
+    mindmapHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.mindmap",
+        this.config.hotkeys
+      );
+    },
+    changeSourceHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.changeSource",
+        this.config.hotkeys
+      );
+    },
+    createIssueHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.createIssue",
+        this.config.hotkeys
+      );
+    },
     postSessionData() {
       if (this.config.checklist) return this.config.checklist.postsession;
       else return {};
@@ -921,6 +1027,15 @@ export default {
     this.timer = 0;
   },
   methods: {
+    openIssueMenu() {
+      this.issueCreateDestinationMenu = true;
+      setTimeout(() => {
+        this.$refs.issueMenu.$children
+          .slice(-1)[0]
+          ?.$el.querySelector(".v-list-item")
+          .focus();
+      }, 150); // TODO - this is probably prone to race conditions
+    },
     bindIPCEvent() {
       if (!window.ipc) return;
 
@@ -990,6 +1105,7 @@ export default {
       if (!this.checkedStatusOfPreSessionTask) {
         return;
       }
+      this.clearSession();
       this.$store.commit("setQuickTest", false);
       this.showSourcePickerDialog();
     },
@@ -1252,7 +1368,7 @@ export default {
       this.changeSessionStatus(this.status);
       this.$store.commit("setStatus", this.status);
     },
-    screenshot() {
+    handleScreenshot() {
       this.fetchSources().then((data) => {
         const list = data.filter((v) => v.id === this.sourceId);
         if (list.length === 0) {
diff --git a/src/components/TestWrapper.vue b/src/components/TestWrapper.vue
index 6578fd05..7d447b7f 100644
--- a/src/components/TestWrapper.vue
+++ b/src/components/TestWrapper.vue
@@ -6,6 +6,8 @@
           <div
             class="subtitle-2 label-text"
             :style="{ color: currentTheme.secondary }"
+            v-shortkey="titleHotkey"
+            @shortkey="$hotkeyHelpers.focusField($refs, 'titleTextField')"
           >
             {{ $tc("caption.title", 1) }}
           </div>
@@ -14,8 +16,6 @@
             outlined
             dense
             :height="35"
-            v-model="title"
-            @input="updateTitle"
             :color="currentTheme.secondary"
             :loading="titleLoading"
             :append-icon="
@@ -25,6 +25,9 @@
                   : 'mdi-robot-outline'
                 : ''
             "
+            v-model="title"
+            ref="titleTextField"
+            @input="updateTitle"
             @click:append="handleAISuggestion('title', $event)"
           >
             <template v-slot:progress>
@@ -41,6 +44,8 @@
           <div
             class="subtitle-2 label-text"
             :style="{ color: currentTheme.secondary }"
+            v-shortkey="charterHotkey"
+            @shortkey="$hotkeyHelpers.focusField($refs, 'charter')"
           >
             {{ $tc("caption.charter", 1) }}
           </div>
@@ -130,11 +135,14 @@
           <div
             class="subtitle-2 label-text"
             :style="{ color: currentTheme.secondary }"
+            v-shortkey="timeLimitHotkey"
+            @shortkey="$hotkeyHelpers.focusField($refs, 'timeLimitTextField')"
           >
             {{ $tc("caption.time_limit", 1) }}
           </div>
           <div class="timer-box-wrapper">
             <v-text-field
+              ref="timeLimitTextField"
               placeholder="00:00"
               v-mask="'##:##'"
               outlined
@@ -150,7 +158,20 @@
           </div>
         </div>
         <div class="mt-4 pre-cond">
-          <v-card v-if="charterLoading" class="loading-wrapper" outlined flat>
+          <div
+            class="subtitle-2 label-text"
+            :style="{ color: currentTheme.secondary }"
+            v-shortkey="preconditionsHotkey"
+            @shortkey="$hotkeyHelpers.focusField($refs, 'preconditions')"
+          >
+            {{ $tc("caption.preconditions", 1) }}
+          </div>
+          <v-card
+            v-if="preconditionsLoading"
+            class="loading-wrapper"
+            outlined
+            flat
+          >
             <v-progress-circular
               :color="currentTheme.primary"
               size="70"
@@ -162,7 +183,6 @@
             v-else
             v-model="preconditions.content"
             :placeholder="$t('message.define_required_precondition')"
-            :label="$tc('caption.precondition', 1)"
             ref="preconditions"
             :toolbar="[
               'headings',
@@ -270,6 +290,36 @@ export default {
     };
   },
   computed: {
+    titleHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "sessionPlanning.title",
+        this.config.hotkeys
+      );
+    },
+    charterHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "sessionPlanning.charter",
+        this.config.hotkeys
+      );
+    },
+    timeLimitHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "sessionPlanning.timeLimit",
+        this.config.hotkeys
+      );
+    },
+    preconditionsHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "sessionPlanning.preconditions",
+        this.config.hotkeys
+      );
+    },
+    checkListHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "sessionPlanning.checklist",
+        this.config.hotkeys
+      );
+    },
     aiAssistEnabled() {
       return this?.config?.ai?.enabled || false;
     },
diff --git a/src/components/dialogs/AboutDialog.vue b/src/components/dialogs/AboutDialog.vue
index 7db4e757..049bc860 100644
--- a/src/components/dialogs/AboutDialog.vue
+++ b/src/components/dialogs/AboutDialog.vue
@@ -36,8 +36,10 @@
                 small
                 block
                 :color="currentTheme.primary"
-                @click="handleClose"
                 :style="{ color: currentTheme.white }"
+                v-shortkey="closeHotkey"
+                @shortkey="handleClose()"
+                @click="handleClose()"
               >
                 {{ $tc("caption.close", 1) }}
               </v-btn>
@@ -72,7 +74,18 @@ export default {
       config: this.configItem,
     };
   },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    closeHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
diff --git a/src/components/dialogs/AudioErrorDialog.vue b/src/components/dialogs/AudioErrorDialog.vue
index aee8e143..57ad0638 100644
--- a/src/components/dialogs/AudioErrorDialog.vue
+++ b/src/components/dialogs/AudioErrorDialog.vue
@@ -11,7 +11,9 @@
             small
             :color="currentTheme.primary"
             class="text-capitalize"
-            @click="cancel"
+            v-shortkey="cancelHotkey"
+            @shortkey="handleCancel()"
+            @click="handleCancel()"
           >
             {{ $tc("caption.ok", 1) }}
           </v-btn>
@@ -29,10 +31,30 @@ export default {
     LogoWrapper,
   },
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     title: String,
     text: String,
   },
+  data() {
+    return {
+      config: this.configItem,
+    };
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -42,7 +64,7 @@ export default {
     },
   },
   methods: {
-    cancel() {
+    handleCancel() {
       this.$emit("cancel");
     },
   },
diff --git a/src/components/dialogs/DeleteConfirmDialog.vue b/src/components/dialogs/DeleteConfirmDialog.vue
index 9ca48e7b..1578f93c 100644
--- a/src/components/dialogs/DeleteConfirmDialog.vue
+++ b/src/components/dialogs/DeleteConfirmDialog.vue
@@ -11,7 +11,9 @@
             small
             :color="currentTheme.primary"
             class="text-capitalize btn"
-            @click="confirm"
+            v-shortkey="confirmHotkey"
+            @shortkey="handleConfirm()"
+            @click="handleConfirm()"
           >
             {{ $tc("caption.confirm", 1) }}
           </v-btn>
@@ -19,7 +21,9 @@
             small
             color="currentTheme.background"
             class="text-capitalize btn"
-            @click="cancel"
+            v-shortkey="cancelHotkey"
+            @shortkey="handleCancel()"
+            @click="handleCancel()"
           >
             {{ $tc("caption.cancel", 1) }}
           </v-btn>
@@ -37,10 +41,36 @@ export default {
     LogoWrapper,
   },
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     title: String,
     text: String,
   },
+  data() {
+    return {
+      config: this.configItem,
+    };
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -50,10 +80,10 @@ export default {
     },
   },
   methods: {
-    cancel() {
+    handleCancel() {
       this.$emit("cancel");
     },
-    confirm() {
+    handleConfirm() {
       this.$emit("confirm");
     },
   },
diff --git a/src/components/dialogs/DurationConfirmDialog.vue b/src/components/dialogs/DurationConfirmDialog.vue
index 11b66fa6..05045028 100644
--- a/src/components/dialogs/DurationConfirmDialog.vue
+++ b/src/components/dialogs/DurationConfirmDialog.vue
@@ -11,7 +11,9 @@
             small
             :color="currentTheme.primary"
             class="text-capitalize btn"
-            @click="preceed"
+            v-shortkey="proceedHotkey"
+            @shortkey="handleProceed()"
+            @click="handleProceed()"
           >
             {{ $tc("caption.proceed", 1) }}
           </v-btn>
@@ -19,7 +21,9 @@
             small
             color="currentTheme.background"
             class="text-capitalize btn"
-            @click="end"
+            v-shortkey="endHotkey"
+            @shortkey="handleEnd()"
+            @click="handleEnd()"
           >
             {{ $tc("caption.end", 1) }}
           </v-btn>
@@ -37,10 +41,36 @@ export default {
     LogoWrapper,
   },
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     title: String,
     text: String,
   },
+  data() {
+    return {
+      config: this.configItem,
+    };
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    proceedHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    endHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -50,10 +80,10 @@ export default {
     },
   },
   methods: {
-    preceed() {
+    handleProceed() {
       this.$emit("proceed");
     },
-    end() {
+    handleEnd() {
       this.$emit("end");
     },
   },
diff --git a/src/components/dialogs/EndSessionDialog.vue b/src/components/dialogs/EndSessionDialog.vue
index fe7e360c..e44fdece 100644
--- a/src/components/dialogs/EndSessionDialog.vue
+++ b/src/components/dialogs/EndSessionDialog.vue
@@ -11,7 +11,9 @@
           <v-btn
             color="primary text-capitalize white__text"
             class="btn-end"
-            @click="endSession"
+            v-shortkey="confirmHotkey"
+            @shortkey="endSession()"
+            @click="endSession()"
           >
             {{ $tc("caption.end_session", 1) }}
           </v-btn>
@@ -19,7 +21,9 @@
             color="white text-capitalize"
             class="btn-end"
             :style="{ color: currentTheme.black }"
-            @click="cancel"
+            v-shortkey="cancelHotkey"
+            @shortkey="handleCancel()"
+            @click="handleCancel()"
           >
             {{ $tc("caption.cancel", 1) }}
           </v-btn>
@@ -37,12 +41,39 @@ export default {
     CheckTaskWrapper,
   },
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     postSessionData: {
       type: Object,
       default: () => {},
     },
   },
+  data() {
+    return {
+      config: this.configItem,
+      showTaskError: false,
+    };
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     tasks() {
       return this.postSessionData ? this.postSessionData.tasks : [];
     },
@@ -54,11 +85,6 @@ export default {
       }
     },
   },
-  data() {
-    return {
-      showTaskError: false,
-    };
-  },
   methods: {
     endSession: function () {
       const uncheckedTasks = this.postSessionData.tasks.filter(
@@ -73,7 +99,7 @@ export default {
       this.showTaskError = false;
       this.$emit("proceed", true);
     },
-    cancel: function () {
+    handleCancel: function () {
       this.$emit("proceed", false);
     },
   },
diff --git a/src/components/dialogs/KeyCaptureDialog.vue b/src/components/dialogs/KeyCaptureDialog.vue
new file mode 100644
index 00000000..a971675c
--- /dev/null
+++ b/src/components/dialogs/KeyCaptureDialog.vue
@@ -0,0 +1,139 @@
+<template>
+  <v-dialog
+    v-bind="$attrs"
+    v-on="$listeners"
+    persistent
+    width="100%"
+    max-width="500px"
+    eager
+  >
+    <v-sheet outlined rounded>
+      <v-card>
+        <v-card-title class="body-1">
+          {{ $tc("caption.key_capture", 1) }}
+        </v-card-title>
+        <v-card-text>
+          <h1>{{ printBindings }}</h1>
+        </v-card-text>
+      </v-card>
+    </v-sheet>
+  </v-dialog>
+</template>
+<script>
+export default {
+  name: "KeyCaptureDialog",
+  components: {},
+  props: {
+    selectedKey: {
+      type: String,
+      default: () => "",
+    },
+    selectedBindings: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      closing: false,
+      configKey: "",
+      modifierKeys: [],
+      characterKey: "",
+    };
+  },
+  computed: {
+    printBindings() {
+      if (!this.$hotkeyHelper) {
+        return;
+      }
+      const currentBindings = [...this.modifierKeys, this.characterKey];
+      return this.$hotkeyHelper.printBindings(currentBindings);
+    },
+    currentTheme() {
+      if (this.$vuetify.theme.dark) {
+        return this.$vuetify.theme.themes.dark;
+      } else {
+        return this.$vuetify.theme.themes.light;
+      }
+    },
+  },
+  mounted() {
+    if (this.$el && this.$el.getAttribute("keydown-listener") !== "true") {
+      document.addEventListener("keydown", (event) => {
+        if (this.closing) return;
+
+        let currentModifiers = [];
+        if (event.ctrlKey) currentModifiers.push("ctrl");
+        if (event.metaKey) currentModifiers.push("meta");
+        if (event.altKey) currentModifiers.push("alt");
+        if (event.shiftKey) currentModifiers.push("shift");
+        if (currentModifiers.length > 0) {
+          this.modifierKeys = currentModifiers;
+        } else {
+          this.modifierKeys = [];
+        }
+        if (event.key.length === 1 || event.key.length === 2) {
+          // Non-control characters have a length of 1 (char keys) or 2 (f keys)
+          this.characterKey = String.fromCharCode(event.which).toLowerCase();
+          this.handleSave();
+        } else {
+          this.characterKey = "";
+        }
+      });
+      this.$el.setAttribute("keydown-listener", "true");
+    }
+  },
+  watch: {
+    selectedKey: function (newValue) {
+      this.configKey = newValue || "";
+    },
+    selectedBindings: function (newValue) {
+      let temp = Object.assign([], newValue);
+      this.characterKey = temp.pop() || "";
+      this.modifierKeys = temp;
+    },
+  },
+  methods: {
+    handleSave() {
+      // This prevents folks from swapping the keys during the delay between
+      // saving and closing.
+      this.closing = true;
+      setTimeout(this.handleClose, 350);
+    },
+    handleClose() {
+      // This is a weird hack because two of these show up in the component tree
+      // in Vue Devtools - one without the props passed
+      if (this.configKey && this.configKey.length > 0) {
+        let bindings = [...this.modifierKeys, this.characterKey];
+
+        this.$emit("saveKeyBinding", { key: this.configKey, bindings });
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+.body-1 {
+  font-style: normal !important;
+  font-weight: 500 !important;
+  font-size: 12px !important;
+  line-height: 16px !important;
+  letter-spacing: 0.05em !important;
+  text-transform: uppercase !important;
+  color: #6b7280 !important;
+}
+.subtitle-1 {
+  font-style: normal !important;
+  font-weight: 500 !important;
+  font-size: 14px !important;
+  line-height: 20px !important;
+  color: #111827 !important;
+}
+.caption {
+  font-style: normal !important;
+  font-weight: 500 !important;
+  font-size: 13px !important;
+  line-height: 16px !important;
+  color: #6b7280;
+}
+</style>
diff --git a/src/components/dialogs/NewSessionDialog.vue b/src/components/dialogs/NewSessionDialog.vue
index 1fe4acb7..3cb2a406 100644
--- a/src/components/dialogs/NewSessionDialog.vue
+++ b/src/components/dialogs/NewSessionDialog.vue
@@ -12,6 +12,8 @@
             :color="currentTheme.primary"
             class="text-capitalize btn"
             :style="{ color: currentTheme.white }"
+            v-shortkey="confirmHotkey"
+            @shortkey="$emit('save')"
             @click="$emit('save')"
           >
             {{ $tc("caption.save", 1) }}
@@ -21,6 +23,8 @@
             :color="currentTheme.background"
             class="text-capitalize btn"
             :style="{ color: currentTheme.secondary }"
+            v-shortkey="cancelHotkey"
+            @shortkey="$emit('discard')"
             @click="$emit('discard')"
           >
             {{ $tc("caption.discard", 1) }}
@@ -38,10 +42,36 @@ export default {
     LogoWrapper,
   },
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     title: String,
     text: String,
   },
+  data() {
+    return {
+      config: this.configItem,
+    };
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
diff --git a/src/components/dialogs/NodeEditDialog.vue b/src/components/dialogs/NodeEditDialog.vue
index f5b79b43..34adeec9 100644
--- a/src/components/dialogs/NodeEditDialog.vue
+++ b/src/components/dialogs/NodeEditDialog.vue
@@ -24,7 +24,9 @@
             small
             color="currentTheme.primary"
             class="text-capitalize"
-            @click="save"
+            v-shortkey="confirmHotkey"
+            @shortkey="handleSave()"
+            @click="handleSave()"
           >
             {{ $tc("caption.save", 1) }}
           </v-btn>
@@ -32,7 +34,9 @@
             small
             color="currentTheme.background"
             class="text-capitalize"
-            @click="cancel"
+            v-shortkey="cancelHotkey"
+            @shortkey="handleCancel()"
+            @click="handleCancel()"
           >
             {{ $tc("caption.cancel", 1) }}
           </v-btn>
@@ -68,6 +72,18 @@ export default {
     };
   },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -77,10 +93,10 @@ export default {
     },
   },
   methods: {
-    cancel() {
+    handleCancel() {
       this.$emit("cancel");
     },
-    save() {
+    handleSave() {
       if (this.$refs.form.validate()) {
         this.$emit("save", this.text);
         this.$refs.form.reset();
diff --git a/src/components/dialogs/NoteDialog.vue b/src/components/dialogs/NoteDialog.vue
index adbf8857..ea9918d4 100644
--- a/src/components/dialogs/NoteDialog.vue
+++ b/src/components/dialogs/NoteDialog.vue
@@ -189,7 +189,9 @@
                 small
                 block
                 :color="currentTheme.background"
-                @click="handleDiscard"
+                v-shortkey="cancelHotkey"
+                @shortkey="handleDiscard()"
+                @click="handleDiscard()"
               >
                 {{ $tc("caption.discard", 1) }}
               </v-btn>
@@ -200,7 +202,9 @@
                 small
                 block
                 color="primary"
-                @click="handleSave"
+                v-shortkey="confirmHotkey"
+                @shortkey="handleSave()"
+                @click="handleSave()"
               >
                 {{ $tc("caption.save", 1) }}
               </v-btn>
@@ -279,6 +283,18 @@ export default {
     };
   },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     aiAssistEnabled() {
       return this?.config?.ai?.enabled || false;
     },
diff --git a/src/components/dialogs/ResetConfirmDialog.vue b/src/components/dialogs/ResetConfirmDialog.vue
index a145fb25..6cccd1da 100644
--- a/src/components/dialogs/ResetConfirmDialog.vue
+++ b/src/components/dialogs/ResetConfirmDialog.vue
@@ -11,7 +11,9 @@
             small
             :color="currentTheme.primary"
             class="text-capitalize btn"
-            @click="confirm"
+            v-shortkey="confirmHotkey"
+            @shortkey="handleConfirm()"
+            @click="handleConfirm()"
           >
             {{ $tc("confirm", 1) }}
           </v-btn>
@@ -20,7 +22,9 @@
             :color="currentTheme.background"
             class="text-capitalize btn"
             :style="{ color: currentTheme.secondary }"
-            @click="cancel"
+            v-shortkey="cancelHotkey"
+            @shortkey="handleCancel()"
+            @click="handleCancel()"
           >
             {{ $tc("cancel", 1) }}
           </v-btn>
@@ -38,10 +42,36 @@ export default {
     LogoWrapper,
   },
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     title: String,
     text: String,
   },
+  data() {
+    return {
+      config: this.configItem,
+    };
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -51,10 +81,10 @@ export default {
     },
   },
   methods: {
-    cancel() {
+    handleCancel() {
       this.$emit("cancel");
     },
-    confirm() {
+    handleConfirm() {
       this.$emit("confirm");
     },
   },
diff --git a/src/components/dialogs/SaveConfirmDialog.vue b/src/components/dialogs/SaveConfirmDialog.vue
index 1c4d17a7..4dea6e44 100644
--- a/src/components/dialogs/SaveConfirmDialog.vue
+++ b/src/components/dialogs/SaveConfirmDialog.vue
@@ -11,7 +11,9 @@
             small
             color="currentTheme.primary"
             class="text-uppercase btn"
-            @click="confirm"
+            v-shortkey="confirmHotkey"
+            @shortkey="handleConfirm()"
+            @click="handleConfirm()"
           >
             {{ $tc("ok", 1) }}
           </v-btn>
@@ -29,10 +31,30 @@ export default {
     LogoWrapper,
   },
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     title: String,
     text: String,
   },
+  data() {
+    return {
+      config: this.configItem,
+    };
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
+  },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -42,7 +64,7 @@ export default {
     },
   },
   methods: {
-    confirm() {
+    handleConfirm() {
       this.$emit("confirm");
     },
   },
diff --git a/src/components/dialogs/SourcePickerDialog.vue b/src/components/dialogs/SourcePickerDialog.vue
index d0c1fcdb..2e7dd109 100644
--- a/src/components/dialogs/SourcePickerDialog.vue
+++ b/src/components/dialogs/SourcePickerDialog.vue
@@ -45,7 +45,9 @@
             class="text-capitalize"
             small
             :color="currentTheme.background"
-            @click="close"
+            v-shortkey="cancelHotkey"
+            @shortkey="handleClose()"
+            @click="handleClose()"
           >
             {{ $tc("caption.cancel", 1) }}
           </v-btn>
@@ -54,7 +56,9 @@
             small
             color="primary"
             :disabled="!activeSource"
-            @click="select"
+            v-shortkey="confirmHotkey"
+            @shortkey="handleSelect()"
+            @click="handleSelect()"
           >
             {{ $tc("caption.select", 1) }}
           </v-btn>
@@ -68,6 +72,10 @@
 export default {
   name: "SourcePickerDialog",
   props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
     sources: {
       type: Array,
       default: () => [],
@@ -79,15 +87,31 @@ export default {
   },
   data() {
     return {
+      config: this.configItem,
       activeSource: "",
     };
   },
   watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+    },
     sourceId: function () {
       this.activeSource = this.sourceId;
     },
   },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     currentTheme() {
       if (this.$vuetify.theme.dark) {
         return this.$vuetify.theme.themes.dark;
@@ -97,11 +121,11 @@ export default {
     },
   },
   methods: {
-    close() {
+    handleClose() {
       this.activeSource = "";
       this.$root.$emit("close-sourcepickerdialog");
     },
-    select() {
+    handleSelect() {
       this.$emit("submit-source", this.activeSource);
     },
     setActiveSource(value) {
diff --git a/src/components/dialogs/SummaryDialog.vue b/src/components/dialogs/SummaryDialog.vue
index 96e59373..9becb966 100644
--- a/src/components/dialogs/SummaryDialog.vue
+++ b/src/components/dialogs/SummaryDialog.vue
@@ -106,7 +106,9 @@
                 small
                 block
                 :color="currentTheme.background"
-                @click="handleCancel"
+                v-shortkey="cancelHotkey"
+                @shortkey="handleCancel()"
+                @click="handleCancel()"
               >
                 {{ $tc("caption.cancel", 1) }}
               </v-btn>
@@ -117,7 +119,9 @@
                 small
                 block
                 color="primary"
-                @click="handleSave"
+                v-shortkey="confirmHotkey"
+                @shortkey="handleSave()"
+                @click="handleSave()"
               >
                 {{ $tc("caption.save", 1) }}
               </v-btn>
@@ -188,6 +192,18 @@ export default {
     this.handleClear();
   },
   computed: {
+    confirmHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "general.cancel",
+        this.config.hotkeys
+      );
+    },
     aiAssistEnabled() {
       return this?.config?.ai?.enabled || false;
     },
diff --git a/src/components/settings/AddonsTab.vue b/src/components/settings/AddonsTab.vue
index b9de21f9..9ff81251 100755
--- a/src/components/settings/AddonsTab.vue
+++ b/src/components/settings/AddonsTab.vue
@@ -138,7 +138,6 @@ export default {
     },
     async handleOpenAIKey() {
       let validates = this.$refs.openAIKey.validate();
-      console.log(this.openAIKey);
       if (validates) {
         const date = dayjs().format("YYYY-MM-DD HH:mm:ss");
         const data = {
@@ -157,6 +156,7 @@ export default {
         );
         if (validate) {
           this.openAIKey = this.sanitizeOpenAIKey(this.credentials);
+          this.customErrors = [];
           this.$refs.openAIKey.resetValidation();
           this.$root.$emit(
             "set-snackbar",
diff --git a/src/components/settings/HotkeysTab.vue b/src/components/settings/HotkeysTab.vue
new file mode 100755
index 00000000..bbbaba4f
--- /dev/null
+++ b/src/components/settings/HotkeysTab.vue
@@ -0,0 +1,156 @@
+<template>
+  <v-container class="content-wrapper">
+    <div class="title">{{ $tc("caption.hotkeys", 1) }}</div>
+    <p class="subtitle-1 mb-4" :style="{ color: currentTheme.default }">
+      {{ $t("message.speed_hotkey") }}
+    </p>
+
+    <v-row>
+      <v-col cols="12" class="pa-4">
+        <div class="mb-3 session-type">
+          <p class="subtitle-1 mb-1" :style="{ color: currentTheme.secondary }">
+            {{ $tc("caption.apply_to", 1) }}
+          </p>
+          <v-select
+            :items="hotkeyPages"
+            v-model="chosenPage"
+            :label="$tc('caption.hotkey_pages', 1)"
+            solo
+            dense
+            hide-details="true"
+          ></v-select>
+        </div>
+        <div class="mb-3 precond">
+          <v-list-item
+            v-for="(bindings, key) in hotkeys[chosenPage]"
+            :key="key"
+          >
+            <v-list-item-content>
+              <v-list-item-title>
+                {{ $tc(`hotkeys.${key}`, 1) }}:
+              </v-list-item-title>
+            </v-list-item-content>
+            <v-list-item-action @click="showKeyCaptureDialog(key, bindings)">
+              <v-btn fill small block>
+                {{ $hotkeyHelpers.printBindings(bindings) }}
+              </v-btn>
+            </v-list-item-action>
+          </v-list-item>
+        </div>
+      </v-col>
+    </v-row>
+    <KeyCaptureDialog
+      v-model="keyCaptureDialog"
+      @saveKeyBinding="saveKeyBinding"
+      :selectedKey="selectedKey"
+      :selectedBindings="selectedBindings"
+    />
+  </v-container>
+</template>
+
+<script>
+import { HOTKEY_PAGES } from "../../modules/constants";
+
+import KeyCaptureDialog from "../dialogs/KeyCaptureDialog.vue";
+
+export default {
+  name: "HotkeyTab",
+  components: {
+    KeyCaptureDialog,
+  },
+  props: {
+    configItem: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  watch: {
+    configItem: function (newValue) {
+      this.config = newValue;
+      this.hotkeys = newValue.hotkeys;
+    },
+  },
+  computed: {
+    currentTheme() {
+      if (this.$vuetify.theme.dark) {
+        return this.$vuetify.theme.themes.dark;
+      } else {
+        return this.$vuetify.theme.themes.light;
+      }
+    },
+  },
+  data() {
+    return {
+      config: this.configItem,
+      hotkeys: this.configItem.hotkeys,
+      chosenPage: "",
+      hotkeyPages: HOTKEY_PAGES,
+      keyCaptureDialog: false,
+      selectedKey: "",
+      selectedBindings: [],
+    };
+  },
+  created() {
+    this.hotkeyPages = HOTKEY_PAGES.map((value) => {
+      return {
+        value,
+        text: this.$tc(`hotkeys.${value}`, 1),
+      };
+    });
+  },
+  mounted() {
+    if (this.chosenPage === "") {
+      this.chosenPage = Object.keys(this.configItem.hotkeys)[0];
+    }
+  },
+  methods: {
+    saveKeyBinding({ key, bindings }) {
+      if (!key || !bindings) return;
+      // Accept key and binding, then update and save
+      this.hotkeys[this.chosenPage][key] = bindings;
+      this.config.hotkeys = this.hotkeys;
+
+      this.$emit("submit-config", this.config);
+
+      this.keyCaptureDialog = false;
+      this.selectedKey = "";
+      this.selectedBindings = [];
+    },
+    showKeyCaptureDialog(key, bindings) {
+      if (!window.ipc) return;
+      this.selectedKey = key;
+      this.selectedBindings = bindings;
+      this.keyCaptureDialog = true;
+    },
+  },
+};
+</script>
+<style scoped>
+.content-wrapper {
+  height: 100vh;
+  width: 100%;
+  overflow-y: auto;
+}
+.body-1 {
+  font-style: normal !important;
+  font-weight: 500 !important;
+  font-size: 12px !important;
+  line-height: 16px !important;
+  letter-spacing: 0.05em !important;
+  text-transform: uppercase !important;
+  color: #6b7280 !important;
+}
+.subtitle-1 {
+  font-style: normal !important;
+  font-weight: 500 !important;
+  font-size: 14px !important;
+  line-height: 20px !important;
+}
+.caption {
+  font-style: normal !important;
+  font-weight: 500 !important;
+  font-size: 13px !important;
+  line-height: 16px !important;
+  color: #6b7280;
+}
+</style>
diff --git a/src/helpers/HotkeyHelpers.js b/src/helpers/HotkeyHelpers.js
new file mode 100644
index 00000000..5b73c98e
--- /dev/null
+++ b/src/helpers/HotkeyHelpers.js
@@ -0,0 +1,38 @@
+export default {
+  findBinding(key, bindingConfig) {
+    let keys = key.split(".");
+    let bindingCursor = bindingConfig;
+    for (const k of keys) {
+      if (bindingCursor) {
+        bindingCursor = bindingCursor?.[k];
+      }
+    }
+    if (bindingCursor && bindingCursor.constructor === String) {
+      return this.findBinding(bindingCursor, bindingConfig);
+    }
+    return bindingCursor || [];
+  },
+  printBindings(directBinding, bindingConfig) {
+    if (directBinding.constructor === Array) {
+      return directBinding.join(" + ").toUpperCase();
+    } else {
+      return this.findBinding(directBinding, bindingConfig)
+        .join(" + ")
+        .toUpperCase();
+    }
+  },
+  focusField(refs, label) {
+    const el = refs[label]?.$el || refs[label];
+    let input = el.querySelector(".ProseMirror");
+    if (!input) {
+      input = el.querySelector(
+        "input:not([type=hidden]),textarea:not([type=hidden])"
+      );
+    }
+    if (input) {
+      setTimeout(() => {
+        input.focus();
+      });
+    }
+  },
+};
diff --git a/src/integrations/OpenAIIntegrationHelpers.js b/src/integrations/OpenAIIntegrationHelpers.js
old mode 100755
new mode 100644
index 1fcadffc..b364105f
--- a/src/integrations/OpenAIIntegrationHelpers.js
+++ b/src/integrations/OpenAIIntegrationHelpers.js
@@ -8,6 +8,10 @@ import {
 
 export default {
   async enhanceText(credentials, config, field, text) {
+    if (!credentials?.openai?.accessToken) {
+      return { error: "You must provide an OpenAI key in Settings > Addons." };
+    } // TODO - i18n
+
     let returnResponse = {
       content: "",
     };
@@ -61,7 +65,6 @@ export default {
 
     credentials.openai = formattedData;
 
-    console.log(`Creds: ${JSON.stringify(credentials.openai)}`);
     window.ipc.invoke(IPC_HANDLERS.DATABASE, {
       func: IPC_FUNCTIONS.UPDATE_CREDENTIALS,
       data: credentials,
diff --git a/src/layouts/Default.vue b/src/layouts/Default.vue
index 7ea09429..f3091d9e 100644
--- a/src/layouts/Default.vue
+++ b/src/layouts/Default.vue
@@ -16,7 +16,11 @@
           </v-btn>
         </template>
       </v-snackbar>
-      <AboutDialog v-model="aboutDialog" :version="aboutVersion" />
+      <AboutDialog
+        v-model="aboutDialog"
+        :version="aboutVersion"
+        :configItem="config"
+      />
     </v-main>
   </v-app>
 </template>
diff --git a/src/locales/en.json b/src/locales/en.json
index 362eacf0..3d68424d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -11,6 +11,7 @@
     "jira_instance_url": "Instance URL (Leave blank for cloud.)",
     "instance_url": "Instance URL",
     "share_config": "Got your configuration just how you like it? You can share your config file with your team to standardize your process or help them get started quicker!",
+    "key_capture": "Press your new hotkey to update",
     "split_credentials": "Your credentials are split into a separate file than your configuration. If you would like to share a custom server OAuth configuration, you can click ",
     "here": "here",
     "new_session": "New session",
@@ -47,6 +48,7 @@
     "checklists": "Checklists",
     "reports": "Reports",
     "addons": "Addons",
+    "hotkeys": "Hotkeys",
     "support": "Support",
     "signup_test_app": "Sign up to test apps",
     "back": "Back",
@@ -112,8 +114,10 @@
     "note_template": "Note templates",
     "apply_to": "Apply to",
     "session_type": "Session type",
+    "hotkey_pages": "Hotkey pages",
     "bug": "Bug",
     "save_template": "Save template",
+    "save_hotkey": "Save hotkeys",
     "checklist": "Checklist",
     "required_checkbox": "Required checkboxes",
     "required_field": "This field is required",
@@ -150,6 +154,7 @@
     "elapsed_time": "Elapsed time",
     "remaining_time": "Remaining time",
     "charter": "Charter",
+    "preconditions": "Preconditions",
     "editor": "Editor",
     "time_limit": "Time limit",
     "minute": "Minutes",
@@ -207,6 +212,38 @@
     "no_server_oauth_creds": "No shareable OAuth credentials found.",
     "testrail_instance_url":"Instance URL"
   },
+  "hotkeys": {
+    "general": "General",
+    "home": "Home",
+    "sessionPlanning": "Session planning",
+    "workspace": "Active session",
+    "evidence": "Evidence capture",
+    "cancel": "Cancel",
+    "save": "Save",
+    "quickTest": "Quick test", 
+    "newExploratorySession": "New exploratory session", 
+    "openExploratorySession": "Open exploratory session",
+    "title": "Jump to title", 
+    "charter": "Jump to charter",
+    "timeLimit": "Jump to time limit", 
+    "preconditions": "Jump to preconditoins",
+    "checklist": "Jump to checklist",
+    "start": "Start",
+    "back": "Back",
+    "pause": "Pause session",
+    "stop": "Stop session",
+    "video": "Take video",
+    "screenshot": "Take screenshot",
+    "voice": "Record audio",
+    "note": "Take note",
+    "mindmap": "Open mindmap",
+    "changeTarget": "Change recording target",
+    "createIssue": "Create issue",
+    "name": "Jump to file name",
+    "description": "Jump to comment",
+    "tags": "Jump to tags",
+    "type": "Jump to comment type"
+  },
   "menu": {
     "about": "About",
     "file": "File",
@@ -268,6 +305,7 @@
     "select_default_comment_type": "Select default note/comment type",
     "make_written_summary": "Make a written summary mandatory upon completing a session",
     "improve_note": "Improve your note taking and evidence labeling with pre-populated templates",
+    "speed_hotkey": "Speed up your workflow with custom hotkeys",
     "define_required_precondition": "Define required preconditions for this test.",
     "enter_title_for_project": "Enter a title for the project",
     "select_presession_task": "You can't begin your session without checking all required(*) pre-session checkboxes.",
diff --git a/src/main.js b/src/main.js
index 75594bd5..dbaaa3a7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,10 +5,12 @@ import VTiptap from "@yatt-ai/vuetify-tiptap";
 import router from "./router";
 import store from "./store";
 import integrationHelpers from "./integrations/IntegrationHelpers";
+import hotkeyHelpers from "./helpers/HotkeyHelpers";
 
 import DefaultLayout from "./layouts/Default.vue";
 import MinimizeLayout from "./layouts/Minimize.vue";
 
+import VueShortkey from "vue-shortkey";
 import VueMask from "v-mask";
 import i18n from "./i18n";
 
@@ -32,6 +34,7 @@ library.add(faBookmark);
 library.add(faPlus);
 library.add(faTableList);
 
+Vue.use(VueShortkey);
 Vue.use(VTiptap);
 Vue.use(VueMask);
 
@@ -45,6 +48,8 @@ const plugins = {
   install() {
     Vue.integrationHelpers = integrationHelpers;
     Vue.prototype.$integrationHelpers = integrationHelpers;
+    Vue.hotkeyHelpers = hotkeyHelpers;
+    Vue.prototype.$hotkeyHelpers = hotkeyHelpers;
   },
 };
 Vue.use(plugins);
diff --git a/src/modules/DatabaseUtility.js b/src/modules/DatabaseUtility.js
index 983a9c67..3a9cf930 100644
--- a/src/modules/DatabaseUtility.js
+++ b/src/modules/DatabaseUtility.js
@@ -102,6 +102,49 @@ const defaultConfig = {
       status: false,
     },
   },
+  hotkeys: {
+    general: {
+      cancel: ["ctrl", "c"],
+      save: ["ctrl", "s"],
+    },
+    home: {
+      quickTest: ["ctrl", "q"],
+      newExploratorySession: ["ctrl", "e"],
+      openExploratorySession: ["ctrl", "o"],
+    },
+    sessionPlanning: {
+      title: ["ctrl", "t"],
+      charter: ["ctrl", "h"],
+      timeLimit: ["ctrl", "l"],
+      preconditions: ["ctrl", "p"],
+      checklist: ["ctrl", "e"],
+      start: "general.save",
+    },
+    workspace: {
+      pause: ["ctrl", "p"],
+      resume: "workspace.pause",
+      stop: ["ctrl", "h"],
+      videoStart: ["ctrl", "v"],
+      videoStop: "workspace.videoStart",
+      screenshot: ["ctrl", "r"],
+      audioStart: ["ctrl", "a"],
+      audioStop: "workspace.audioStart",
+      note: ["ctrl", "n"],
+      mindmap: ["ctrl", "m"],
+      changeSource: ["ctrl", "o"],
+      createIssue: ["ctrl", "i"],
+      back: ["ctrl", "b"],
+    }, // Dialogs on workspace use general.save and general.cancel
+    evidence: {
+      name: ["ctrl", "n"],
+      followUp: ["ctrl", "f"],
+      comment: ["ctrl", "d"],
+      tags: ["ctrl", "t"],
+      type: ["ctrl", "y"],
+      save: "general.save",
+      cancel: "general.cancel",
+    },
+  },
 };
 
 module.exports.initializeSession = () => {
diff --git a/src/modules/FileSystemUtility.js b/src/modules/FileSystemUtility.js
index 3cf8ac86..c4a1a17c 100644
--- a/src/modules/FileSystemUtility.js
+++ b/src/modules/FileSystemUtility.js
@@ -158,7 +158,7 @@ module.exports.openSession = async () => {
   if (canceled) {
     return Promise.resolve({
       status: STATUSES.ERROR,
-      message: "no file selected",
+      message: "No file selected",
     });
   }
 
@@ -324,7 +324,7 @@ module.exports.openConfigFile = async () => {
   if (canceled) {
     return Promise.resolve({
       status: STATUSES.ERROR,
-      message: "no file selected",
+      message: "No file selected",
     });
   }
 
@@ -361,7 +361,7 @@ module.exports.openCredentialsFile = async () => {
   if (canceled) {
     return Promise.resolve({
       status: STATUSES.ERROR,
-      message: "no file selected",
+      message: "No file selected",
     });
   }
 
diff --git a/src/modules/constants.js b/src/modules/constants.js
index 0c233eb2..28bd85cc 100644
--- a/src/modules/constants.js
+++ b/src/modules/constants.js
@@ -86,6 +86,7 @@ export const IPC_BIND_KEYS = {
   CLOSED_ENDSESSION_DIALOG: "endsession_dialog_closed",
   CLOSED_SOURCEPICKER_DIALOG: "sourcepicker_dialog_closed",
   CLOSED_SHARE_OAUTH_DIALOG: "share_oauth_dialog_closed",
+  CLOSED_KEY_CAPTURE_DIALOG: "key_capture_dialog_closed",
 };
 
 export const STATUSES = {
@@ -112,6 +113,14 @@ export const SESSION_TYPES = [
   "Mindmap",
 ];
 
+export const HOTKEY_PAGES = [
+  "general",
+  "home",
+  "sessionPlanning",
+  "workspace",
+  "evidence",
+];
+
 export const VIEW_MODE = {
   NORMAL: "normal",
   MINI: "minimized",
diff --git a/src/router/index.js b/src/router/index.js
index 1cb93f4c..c6c4b0b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -26,6 +26,7 @@ import TemplateTab from "@/components/settings/TemplateTab.vue";
 import ConfigCheckListTab from "@/components/settings/ConfigCheckListTab.vue";
 import ReportsTab from "@/components/settings/ReportsTab.vue";
 import AddonsTab from "@/components/settings/AddonsTab.vue";
+import HotkeysTab from "@/components/settings/HotkeysTab.vue";
 
 import NoteEditorView from "../views/NoteEditorView.vue";
 import SummaryEditorView from "../views/SummaryEditorView.vue";
@@ -140,6 +141,12 @@ const routes = [
         component: AddonsTab,
         props: true,
       },
+      {
+        path: "hotkeys",
+        name: "hotkeys",
+        component: HotkeysTab,
+        props: true,
+      },
     ],
   },
   {
diff --git a/src/views/AddEvidence.vue b/src/views/AddEvidence.vue
index 907c5c8e..4d03b94e 100644
--- a/src/views/AddEvidence.vue
+++ b/src/views/AddEvidence.vue
@@ -71,7 +71,11 @@
             </v-card>
           </v-menu>
         </div>
-        <div class="check-box">
+        <div
+          class="check-box"
+          v-shortkey="followUpHotkey"
+          @shortkey="toggleFollowUp()"
+        >
           <label
             ><input
               type="checkbox"
@@ -79,19 +83,24 @@
               class="item-select"
               v-model="followUp"
               :disabled="processing"
-              @change="handleFollowUp($event)"
             />{{ $tc("caption.required_follow_up", 1) }}
           </label>
         </div>
-        <v-text-field
-          name="name"
-          color="secondary"
-          :label="$tc('caption.filename', 1)"
-          v-model="name"
-          :suffix="fileSuffix"
-          :disabled="processing"
-          @input="handleName"
-        />
+        <div
+          v-shortkey="nameHotkey"
+          @shortkey="$hotkeyHelpers.focusField($refs, 'nameTextField')"
+        >
+          <v-text-field
+            name="name"
+            color="secondary"
+            :label="$tc('caption.filename', 1)"
+            v-model="name"
+            :suffix="fileSuffix"
+            :disabled="processing"
+            ref="nameTextField"
+            @input="handleName"
+          />
+        </div>
         <v-card v-if="commentLoading" class="loading-wrapper" outlined flat>
           <v-progress-circular
             :color="currentTheme.primary"
@@ -100,63 +109,79 @@
             indeterminate
           ></v-progress-circular>
         </v-card>
-        <v-tiptap
+        <div
           v-else
-          v-model="comment.content"
-          :placeholder="$t('message.insert_comment')"
-          ref="comment"
-          :toolbar="[
-            'headings',
-            '|',
-            'bold',
-            'italic',
-            'underline',
-            '|',
-            'color',
-            '|',
-            'bulletList',
-            'orderedList',
-            '|',
-            'link',
-            'emoji',
-            'blockquote',
-            '|',
-            '#aiAssist',
-          ]"
-          @input="updateComment"
+          v-shortkey="commentHotkey"
+          @shortkey="$hotkeyHelpers.focusField($refs, 'comment')"
         >
-          <template #aiAssist="">
-            <v-btn
-              v-if="aiAssistEnabled"
-              icon
-              small
-              :title="$tc('caption.ai_assist', 1)"
-              @click="handleAISuggestion('comment', $event)"
-            >
-              <v-icon>{{
-                previousComment?.content
-                  ? "mdi-robot-off-outline"
-                  : "mdi-robot-outline"
-              }}</v-icon>
-            </v-btn>
-          </template>
-        </v-tiptap>
-        <vue-tags-input
-          class="input-box"
-          v-model="tagText"
-          :tags="tags"
-          label="Tags"
-          :max-tags="10"
-          :maxlength="20"
-          @tags-changed="handleTags"
-          :placeholder="$t('message.insert_tag')"
-          :disabled="processing"
-        />
+          <v-tiptap
+            v-model="comment.content"
+            :placeholder="$t('message.insert_comment')"
+            ref="comment"
+            :toolbar="[
+              'headings',
+              '|',
+              'bold',
+              'italic',
+              'underline',
+              '|',
+              'color',
+              '|',
+              'bulletList',
+              'orderedList',
+              '|',
+              'link',
+              'emoji',
+              'blockquote',
+              '|',
+              '#aiAssist',
+            ]"
+            @input="updateComment"
+          >
+            <template #aiAssist="">
+              <v-btn
+                v-if="aiAssistEnabled"
+                icon
+                small
+                :title="$tc('caption.ai_assist', 1)"
+                @click="handleAISuggestion('comment', $event)"
+              >
+                <v-icon>{{
+                  previousComment?.content
+                    ? "mdi-robot-off-outline"
+                    : "mdi-robot-outline"
+                }}</v-icon>
+              </v-btn>
+            </template>
+          </v-tiptap>
+        </div>
+        <div
+          v-shortkey="tagsHotkey"
+          @shortkey="$hotkeyHelpers.focusField($refs, 'tags')"
+        >
+          <vue-tags-input
+            ref="tags"
+            class="input-box"
+            v-model="tagText"
+            :tags="tags"
+            label="Tags"
+            :max-tags="10"
+            :maxlength="20"
+            @tags-changed="handleTags"
+            :placeholder="$t('message.insert_tag')"
+            :disabled="processing"
+          />
+        </div>
         <div class="comment-type">
-          <div :style="{ color: currentTheme.secondary }">
+          <div
+            :style="{ color: currentTheme.secondary }"
+            v-shortkey="typeHotkey"
+            @shortkey="openCommentType()"
+          >
             {{ $tc("caption.comment_type", 1) }}
           </div>
           <v-select
+            ref="commentType"
             :items="commentTypes"
             v-model="comment.type"
             :placeholder="$tc('caption.comment_type', 1)"
@@ -187,7 +212,9 @@
           color="white"
           :disabled="processing"
           :style="{ color: currentTheme.black }"
-          @click="handleDiscard"
+          v-shortkey="cancelHotkey"
+          @shortkey="handleDiscard()"
+          @click="handleDiscard()"
         >
           {{ $tc("caption.discard", 1) }}
         </v-btn>
@@ -197,7 +224,9 @@
           small
           color="primary"
           :disabled="processing"
-          @click="handleSave"
+          v-shortkey="saveHotkey"
+          @shortkey="handleSave()"
+          @click="handleSave()"
         >
           {{ $tc("caption.save", 1) }}
         </v-btn>
@@ -265,6 +294,48 @@ export default {
     this.getCredentials();
   },
   computed: {
+    nameHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.name",
+        this.config.hotkeys
+      );
+    },
+    followUpHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.followUp",
+        this.config.hotkeys
+      );
+    },
+    commentHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.comment",
+        this.config.hotkeys
+      );
+    },
+    tagsHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.tags",
+        this.config.hotkeys
+      );
+    },
+    typeHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.type",
+        this.config.hotkeys
+      );
+    },
+    saveHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.cancel",
+        this.config.hotkeys
+      );
+    },
     aiAssistEnabled() {
       return this?.config?.ai?.enabled || false;
     },
@@ -323,6 +394,16 @@ export default {
     this.$root.$on("save-data", this.saveData);
   },
   methods: {
+    toggleFollowUp() {
+      this.followUp = !this.followUp;
+    },
+    openCommentType() {
+      const input = this.$refs.commentType.$el.querySelector(
+        "input:not([type=hidden]),textarea:not([type=hidden])"
+      );
+      input.click();
+      input.focus();
+    },
     fetchItems() {
       if (!window.ipc) return;
 
diff --git a/src/views/EditEvidence.vue b/src/views/EditEvidence.vue
index 67267af3..5e3c1745 100644
--- a/src/views/EditEvidence.vue
+++ b/src/views/EditEvidence.vue
@@ -72,7 +72,11 @@
               </v-card>
             </v-menu>
           </div>
-          <div class="check-box">
+          <div
+            class="check-box"
+            v-shortkey="followUpHotkey"
+            @shortkey="toggleFollowUp()"
+          >
             <label
               ><input
                 type="checkbox"
@@ -84,15 +88,21 @@
             </label>
           </div>
         </div>
-        <v-text-field
-          name="name"
-          color="secondary"
-          :label="$tc('caption.filename', 1)"
-          v-model="name"
-          :suffix="fileSuffix"
-          :disabled="processing"
-          @input="handleName"
-        />
+        <div
+          v-shortkey="nameHotkey"
+          @shortkey="$hotkeyHelpers.focusField($refs, 'nameTextField')"
+        >
+          <v-text-field
+            name="name"
+            color="secondary"
+            :label="$tc('caption.filename', 1)"
+            v-model="name"
+            :suffix="fileSuffix"
+            :disabled="processing"
+            ref="nameTextField"
+            @input="handleName"
+          />
+        </div>
         <v-card v-if="commentLoading" class="loading-wrapper" outlined flat>
           <v-progress-circular
             :color="currentTheme.primary"
@@ -101,46 +111,52 @@
             indeterminate
           ></v-progress-circular>
         </v-card>
-        <v-tiptap
-          v-model="item.comment.content"
-          :placeholder="$t('message.insert_comment')"
-          ref="comment"
-          :toolbar="[
-            'headings',
-            '|',
-            'bold',
-            'italic',
-            'underline',
-            '|',
-            'color',
-            '|',
-            'bulletList',
-            'orderedList',
-            '|',
-            'link',
-            'emoji',
-            'blockquote',
-            '|',
-            '#aiAssist',
-          ]"
-          @input="updateComment"
+        <div
+          v-else
+          v-shortkey="commentHotkey"
+          @shortkey="$hotkeyHelpers.focusField($refs, 'comment')"
         >
-          <template #aiAssist="">
-            <v-btn
-              v-if="aiAssistEnabled"
-              icon
-              small
-              :title="$tc('caption.ai_assist', 1)"
-              @click="handleAISuggestion('comment', $event)"
-            >
-              <v-icon>{{
-                previousComment?.content
-                  ? "mdi-robot-off-outline"
-                  : "mdi-robot-outline"
-              }}</v-icon>
-            </v-btn>
-          </template>
-        </v-tiptap>
+          <v-tiptap
+            v-model="item.comment.content"
+            :placeholder="$t('message.insert_comment')"
+            ref="comment"
+            :toolbar="[
+              'headings',
+              '|',
+              'bold',
+              'italic',
+              'underline',
+              '|',
+              'color',
+              '|',
+              'bulletList',
+              'orderedList',
+              '|',
+              'link',
+              'emoji',
+              'blockquote',
+              '|',
+              '#aiAssist',
+            ]"
+            @input="updateComment"
+          >
+            <template #aiAssist="">
+              <v-btn
+                v-if="aiAssistEnabled"
+                icon
+                small
+                :title="$tc('caption.ai_assist', 1)"
+                @click="handleAISuggestion('comment', $event)"
+              >
+                <v-icon>{{
+                  previousComment?.content
+                    ? "mdi-robot-off-outline"
+                    : "mdi-robot-outline"
+                }}</v-icon>
+              </v-btn>
+            </template>
+          </v-tiptap>
+        </div>
         <div class="actions-wrapper" v-if="item.fileType === 'text'">
           <template v-if="item.emoji.length">
             <v-btn
@@ -199,31 +215,31 @@
             </v-card>
           </v-menu>
         </div>
-        <div class="check-box">
-          <label
-            ><input
-              type="checkbox"
-              name="follow_up"
-              class="item-select"
-              v-model="item.followUp"
-              @change="handleFollowUp($event)"
-            />{{ $tc("caption.required_follow_up", 1) }}
-          </label>
+        <div
+          v-shortkey="tagsHotkey"
+          @shortkey="$hotkeyHelpers.focusField($refs, 'tags')"
+        >
+          <vue-tags-input
+            ref="tags"
+            class="input-box"
+            v-model="tag"
+            :tags="item.tags"
+            :max-tags="10"
+            :maxlength="20"
+            @tags-changed="handleTags"
+            :placeholder="$t('message.insert_tag')"
+          />
         </div>
-        <vue-tags-input
-          class="input-box"
-          v-model="tag"
-          :tags="item.tags"
-          :max-tags="10"
-          :maxlength="20"
-          @tags-changed="handleTags"
-          :placeholder="$t('message.insert_tag')"
-        />
         <div class="comment-type">
-          <div :style="{ color: currentTheme.secondary }">
+          <div
+            :style="{ color: currentTheme.secondary }"
+            v-shortkey="typeHotkey"
+            @shortkey="openCommentType()"
+          >
             {{ $tc("caption.comment_type", 1) }}
           </div>
           <v-select
+            ref="commentType"
             :items="commentTypes"
             v-model="item.comment.type"
             :placeholder="$tc('caption.comment_type', 1)"
@@ -253,6 +269,8 @@
           color="white"
           :disabled="processing"
           :style="{ color: currentTheme.black }"
+          v-shortkey="cancelHotkey"
+          @shortkey="handleDiscard()"
           @click="handleDiscard"
         >
           {{ $tc("caption.discard", 1) }}
@@ -263,6 +281,8 @@
           small
           color="primary"
           :disabled="processing"
+          v-shortkey="saveHotkey"
+          @shortkey="handleSave()"
           @click="handleSave"
         >
           {{ $tc("caption.save", 1) }}
@@ -321,6 +341,48 @@ export default {
     this.getCredentials();
   },
   computed: {
+    nameHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.name",
+        this.config.hotkeys
+      );
+    },
+    followUpHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.followUp",
+        this.config.hotkeys
+      );
+    },
+    commentHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.comment",
+        this.config.hotkeys
+      );
+    },
+    tagsHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.tags",
+        this.config.hotkeys
+      );
+    },
+    typeHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.type",
+        this.config.hotkeys
+      );
+    },
+    saveHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.save",
+        this.config.hotkeys
+      );
+    },
+    cancelHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "evidence.cancel",
+        this.config.hotkeys
+      );
+    },
     aiAssistEnabled() {
       return this?.config?.ai?.enabled || false;
     },
@@ -361,6 +423,16 @@ export default {
     this.$root.$on("save-data", this.saveData);
   },
   methods: {
+    toggleFollowUp() {
+      this.item.followUp = !this.item.followUp;
+    },
+    openCommentType() {
+      const input = this.$refs.commentType.$el.querySelector(
+        "input:not([type=hidden]),textarea:not([type=hidden])"
+      );
+      input.click();
+      input.focus();
+    },
     fetchItems() {
       if (!window.ipc) return;
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 2ae7c4eb..a313d598 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -16,7 +16,9 @@
           block
           small
           color="primary"
-          @click="quickTest()"
+          v-shortkey="quickTestHotkey"
+          @shortkey="handleQuickTest()"
+          @click="handleQuickTest()"
         >
           {{ $tc("caption.quick_test", 1) }}
         </v-btn>
@@ -28,6 +30,8 @@
           block
           small
           color="primary"
+          v-shortkey="newExploratoryHotkey"
+          @shortkey="newSession()"
           to="main"
         >
           {{ $tc("caption.new_exploratory_session", 1) }}
@@ -38,6 +42,8 @@
           color="primary"
           small
           class="mt-4 text-capitalize open-btn"
+          v-shortkey="openExploratoryHotkey"
+          @shortkey="openSession()"
           @click="openSession()"
         >
           {{ $tc("caption.open_exploratory_session", 1) }}
@@ -190,6 +196,26 @@ export default {
       showMenu: false,
     };
   },
+  computed: {
+    quickTestHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "home.quickTest",
+        this.config.hotkeys
+      );
+    },
+    newExploratoryHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "home.newExploratorySession",
+        this.config.hotkeys
+      );
+    },
+    openExploratoryHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "home.openExploratorySession",
+        this.config.hotkeys
+      );
+    },
+  },
   created() {
     this.getConfig();
     this.getCredentials();
@@ -207,9 +233,7 @@ export default {
 
     // New session
     window.ipc.on("NEW_SESSION", () => {
-      if (this.$router.history.current.path === "/") {
-        this.$router.push("/main");
-      }
+      this.newSession();
     });
   },
   methods: {
@@ -236,6 +260,11 @@ export default {
           }
         });
     },
+    async newSession() {
+      if (this.$router.history.current.path === "/") {
+        this.$router.push("/main");
+      }
+    },
     async openSession() {
       if (!window.ipc) return;
 
@@ -258,7 +287,7 @@ export default {
         }
       }
     },
-    quickTest() {
+    handleQuickTest() {
       this.$store.commit("setQuickTest", true);
       this.$router.push("/main/workspace");
     },
diff --git a/src/views/MainView.vue b/src/views/MainView.vue
index ca16060f..51b98a3a 100644
--- a/src/views/MainView.vue
+++ b/src/views/MainView.vue
@@ -1,7 +1,15 @@
 <template>
   <v-container class="wrapper pa-0">
     <div class="top" v-if="this.status === 'pending' || $store.state.quickTest">
-      <v-btn class="text-capitalize pa-0 back-btn" plain @click="back()">
+      <v-btn
+        class="text-capitalize pa-0 back-btn"
+        plain
+        rounded
+        solid
+        v-shortkey="backHotkey"
+        @shortkey="back()"
+        @click="back()"
+      >
         <v-icon class="ma-0">mdi-chevron-left</v-icon>
         {{ $tc("caption.back", 1) }}
       </v-btn>
@@ -67,6 +75,7 @@
           <TestWrapper :config-item="config" :credential-items="credentials" />
           <CheckTaskWrapper
             v-if="showCheckList"
+            :config-item="config"
             :tasks="presession.tasks"
             type="preseesion"
           />
@@ -198,6 +207,12 @@ export default {
     });
   },
   computed: {
+    backHotkey() {
+      return this.$hotkeyHelpers.findBinding(
+        "workspace.back",
+        this.config.hotkeys
+      );
+    },
     status() {
       return this.$store.state.status;
     },
diff --git a/src/views/SettingView.vue b/src/views/SettingView.vue
index 2be7861e..bc60ea97 100644
--- a/src/views/SettingView.vue
+++ b/src/views/SettingView.vue
@@ -86,7 +86,12 @@ export default {
           name: this.$tc("caption.addons", 1),
           route: `/settings/addons`,
         },
-        // { id: 7, name: this.$tc("caption.support", 1), route: `/settings/support` },
+        {
+          id: 7,
+          name: this.$tc("caption.hotkeys", 1),
+          route: `/settings/hotkeys`,
+        },
+        // { id: 8, name: this.$tc("caption.support", 1), route: `/settings/support` },
       ],
       metadata: {},
       config: {},
diff --git a/yarn.lock b/yarn.lock
index 59f4de07..c2b555ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4804,6 +4804,11 @@ csstype@^3.1.0:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
   integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
+custom-event-polyfill@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz#9bc993ddda937c1a30ccd335614c6c58c4f87aee"
+  integrity sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==
+
 cyclist@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.2.tgz#673b5f233bf34d8e602b949429f8171d9121bea3"
@@ -5642,6 +5647,11 @@ electron@^13.0.0:
     "@types/node" "^14.6.2"
     extract-zip "^1.0.3"
 
+element-matches@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/element-matches/-/element-matches-0.1.2.tgz#7345cb71e965bd2b12f725e524591c102198361a"
+  integrity sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ==
+
 elliptic@^6.5.3:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
@@ -12588,6 +12598,14 @@ vue-router@^3.5.1:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8"
   integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==
 
+vue-shortkey@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/vue-shortkey/-/vue-shortkey-3.1.7.tgz#31c09a99ed597331a6a49a45eeff894a78a19eef"
+  integrity sha512-Wm/vPXXS+4Wl/LoYpD+cZc0J0HIoVlY8Ep0JLIqqswmAya3XUBtsqKbhzEf9sXo+3rZ5p1YsUyZfXas8XD7YjQ==
+  dependencies:
+    custom-event-polyfill "^1.0.7"
+    element-matches "^0.1.2"
+
 vue-style-loader@^4.1.0, vue-style-loader@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"