diff --git a/examples/official-storybook/tests/__snapshots__/storyshots.test.js.snap b/examples/official-storybook/tests/__snapshots__/storyshots.test.js.snap
index 41cb155db4f..5a3abad4b5d 100644
--- a/examples/official-storybook/tests/__snapshots__/storyshots.test.js.snap
+++ b/examples/official-storybook/tests/__snapshots__/storyshots.test.js.snap
@@ -4461,7 +4461,7 @@ exports[`Storyshots UI|Settings/ShortcutsScreen default shortcuts 1`] = `
               placeholder="Type keys"
               readonly=""
               spellcheck="false"
-              value="S"
+              value="A"
             />
             <svg
               class="emotion-16"
@@ -4511,7 +4511,7 @@ exports[`Storyshots UI|Settings/ShortcutsScreen default shortcuts 1`] = `
               placeholder="Type keys"
               readonly=""
               spellcheck="false"
-              value="A"
+              value="S"
             />
             <svg
               class="emotion-16"
diff --git a/lib/ui/src/containers/nav.js b/lib/ui/src/containers/nav.js
index 3b64e4a9d63..e41d3591c35 100755
--- a/lib/ui/src/containers/nav.js
+++ b/lib/ui/src/containers/nav.js
@@ -11,14 +11,14 @@ import { Consumer } from '../core/context';
 
 const createMenu = memoize(1)((api, shortcutKeys, isFullscreen, showPanel, showNav) => [
   {
-    id: 'A',
+    id: 'S',
     title: 'Show sidebar',
     onClick: () => api.toggleNav(),
     right: shortcutToHumanString(shortcutKeys.toggleNav),
     left: showNav ? <ListItemIcon icon="check" /> : <ListItemIcon />,
   },
   {
-    id: 'S',
+    id: 'A',
     title: 'Show addons',
     onClick: () => api.togglePanel(),
     right: shortcutToHumanString(shortcutKeys.togglePanel),
diff --git a/lib/ui/src/core/shortcuts.js b/lib/ui/src/core/shortcuts.js
index 623eb4ef4ef..0e5ae59ab10 100644
--- a/lib/ui/src/core/shortcuts.js
+++ b/lib/ui/src/core/shortcuts.js
@@ -9,9 +9,9 @@ export const controlOrMetaKey = () => (isMacLike() ? 'meta' : 'control');
 
 export const defaultShortcuts = Object.freeze({
   fullScreen: ['F'],
-  togglePanel: ['S'], // Panel visibiliy
+  togglePanel: ['A'],
   panelPosition: ['D'],
-  toggleNav: ['A'],
+  toggleNav: ['S'],
   toolbar: ['T'],
   search: ['/'],
   focusNav: ['1'],
diff --git a/lib/ui/src/core/shortcuts.test.js b/lib/ui/src/core/shortcuts.test.js
index 4a272e2d9b1..3a78318340a 100644
--- a/lib/ui/src/core/shortcuts.test.js
+++ b/lib/ui/src/core/shortcuts.test.js
@@ -28,7 +28,7 @@ describe('shortcuts api', () => {
     store.setState(state);
 
     expect(api.getShortcutKeys().fullScreen).toEqual(['Z']);
-    expect(api.getShortcutKeys().togglePanel).toEqual(['S']);
+    expect(api.getShortcutKeys().togglePanel).toEqual(['A']);
   });
 
   it('sets defaults, ignoring anything persisted that is out of date', () => {
@@ -61,7 +61,7 @@ describe('shortcuts api', () => {
     await api.setShortcut('togglePanel', ['B']);
     await api.restoreAllDefaultShortcuts();
     expect(api.getShortcutKeys().fullScreen).toEqual(['F']);
-    expect(api.getShortcutKeys().togglePanel).toEqual(['S']);
+    expect(api.getShortcutKeys().togglePanel).toEqual(['A']);
   });
 
   it('restores single default', async () => {
diff --git a/lib/ui/src/settings/shortcuts.test.js b/lib/ui/src/settings/shortcuts.test.js
index f19f6a0ed09..c791f10c055 100644
--- a/lib/ui/src/settings/shortcuts.test.js
+++ b/lib/ui/src/settings/shortcuts.test.js
@@ -8,8 +8,8 @@ import ShortcutsScreen from './shortcuts';
 // A limited set of keys we use in this test file
 const shortcutKeys = {
   fullScreen: ['F'],
-  togglePanel: ['S'],
-  toggleNav: ['A'],
+  togglePanel: ['A'],
+  toggleNav: ['S'],
   toolbar: ['T'],
   search: ['/'],
   focusNav: ['1'],