diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96a291e9..f9c53c53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.5.8](https://github.com/antares-sql/antares/compare/v0.5.7...v0.5.8) (2022-07-02)
+
+
+### Features
+
+* add max visible options prop ([067a6f3](https://github.com/antares-sql/antares/commit/067a6f350757c1e6b4df51f801ae832b47bd3484))
+* context shortcut to disconnect from left bar ([e97da37](https://github.com/antares-sql/antares/commit/e97da3710385690b85391938e40145a1591bc2e8))
+* **MySQL:** option to disable foreign key checks when empty a table ([902c29f](https://github.com/antares-sql/antares/commit/902c29ffa551bc3489fa1d9136ee926d135ea14f))
+
+
+### Bug Fixes
+
+* connection string field doesn't appear switching to postgre when editing a connection ([6573fe6](https://github.com/antares-sql/antares/commit/6573fe69aca2b99c7a700879fb0d0930e864cbe6))
+* ctrl+a on results doesn't work properly ([5f57a9f](https://github.com/antares-sql/antares/commit/5f57a9f60d281e24e5bee4330c081fa5d8651b36))
+* double context menu on table settings rows ([91d0735](https://github.com/antares-sql/antares/commit/91d0735a5f4861bc6ad13b9285ea7a9bd7be9538))
+* editor gutter pin not working ([cfd82c8](https://github.com/antares-sql/antares/commit/cfd82c8f419952879b386187eb146847098263fe))
+* error on modals missing focusable elements ([7702ca0](https://github.com/antares-sql/antares/commit/7702ca025fcae6209ae3851d0ccd25579f93e243))
+* exception on new scheduler tab ([a45d76e](https://github.com/antares-sql/antares/commit/a45d76e8b4ecdecf53438fe174f61ea32f4e10ac))
+* focus goes outside modals with tab key navigation ([e42c424](https://github.com/antares-sql/antares/commit/e42c424a13a6901414a1a1c4e2f68cb4ddef7d59))
+* reactivity problem on BaseVirtualScroll component ([45b2eb2](https://github.com/antares-sql/antares/commit/45b2eb2934b9f7a08f379ad4d7a44b1c89585449))
+* result table cells/rows not loses focus clicking outside ([0a3a482](https://github.com/antares-sql/antares/commit/0a3a4827dd75539666fa2c827415af3bfa224543))
+* **UI:** wrong tables scrollable height after switching tabs ([8f01740](https://github.com/antares-sql/antares/commit/8f01740475ea6d5d9b5eefabdbf27099df76f2cf))
+* **Windows:** white window buttons with dark theme ([a80d227](https://github.com/antares-sql/antares/commit/a80d22740045a61fd14fd5da401c0d123d54f4de))
+* **Windows:** Windows 7 style window frame at startup ([93ce619](https://github.com/antares-sql/antares/commit/93ce619782d58cfb8fb1ecce2ca2137a61ec6181))
+
 ### [0.5.7](https://github.com/antares-sql/antares/compare/v0.5.4...v0.5.7) (2022-06-19)
 
 
diff --git a/package-lock.json b/package-lock.json
index ef8de288..cda40a0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "antares",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "antares",
-      "version": "0.5.7",
+      "version": "0.5.8",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 974d6f36..33eca907 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",
diff --git a/src/renderer/components/ModalAllConnections.vue b/src/renderer/components/ModalAllConnections.vue
index cf3f34a1..f5ae4dde 100644
--- a/src/renderer/components/ModalAllConnections.vue
+++ b/src/renderer/components/ModalAllConnections.vue
@@ -156,7 +156,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, Ref, ref } from 'vue';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useI18n } from 'vue-i18n';
 import { useFocusTrap } from '@/composables/useFocusTrap';
@@ -252,8 +252,8 @@ const confirmDeleteConnection = () => {
 };
 
 const onKey = (e: KeyboardEvent) => {
+   e.stopPropagation();
    if (e.key === 'Escape') {
-      e.stopPropagation();
       if ((e.target as HTMLInputElement).tagName === 'INPUT' && searchTerm.value.length > 0)
          searchTerm.value = '';
       else
@@ -261,7 +261,11 @@ const onKey = (e: KeyboardEvent) => {
    }
 };
 
-window.addEventListener('keydown', onKey, { capture: true });
+window.addEventListener('keydown', onKey);
+
+onBeforeUnmount(() => {
+   window.removeEventListener('keydown', onKey);
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/components/Workspace.vue b/src/renderer/components/Workspace.vue
index 67aae255..6a48c25d 100644
--- a/src/renderer/components/Workspace.vue
+++ b/src/renderer/components/Workspace.vue
@@ -512,7 +512,9 @@ const {
    selectTab,
    newTab,
    removeTab,
-   updateTabs
+   updateTabs,
+   selectNextTab,
+   selectPrevTab
 } = workspacesStore;
 
 const props = defineProps({
@@ -588,6 +590,22 @@ const onKey = (e: KeyboardEvent) => {
       if (currentTab)
          closeTab(currentTab);
    }
+
+   // select next tab
+   if (e.altKey && (e.ctrlKey || e.metaKey) && e.key === 'ArrowRight')
+      selectNextTab({ uid: props.connection.uid });
+
+   // select prev tab
+   if (e.altKey && (e.ctrlKey || e.metaKey) && e.key === 'ArrowLeft')
+      selectPrevTab({ uid: props.connection.uid });
+
+   // select tab by index (range 1-9). CTRL|CMD number
+   if ((e.ctrlKey || e.metaKey) && !e.altKey && e.keyCode >= 49 && e.keyCode <= 57) {
+      const newIndex = parseInt(e.key) - 1;
+
+      if (workspace.value.tabs[newIndex])
+         selectTab({ uid: props.connection.uid, tab: workspace.value.tabs[newIndex].uid });
+   }
 };
 
 const openAsPermanentTab = (tab: WorkspaceTab) => {