diff --git a/frontend/components/Layout/Layout.js b/frontend/components/Layout/Layout.js
index f72064a7b..79f85039f 100644
--- a/frontend/components/Layout/Layout.js
+++ b/frontend/components/Layout/Layout.js
@@ -73,11 +73,6 @@ type Props = {
     this.props.ui.setActiveModal('keyboard-shortcuts');
   }
 
-  @keydown('shift+3')
-  openMarkdownShortcuts() {
-    this.props.ui.setActiveModal('markdown-shortcuts');
-  }
-
   handleCreateCollection = () => {
     this.props.ui.setActiveModal('collection-new');
   };
diff --git a/frontend/components/Layout/components/Modals.js b/frontend/components/Layout/components/Modals.js
index 3d14bf025..37193b8b1 100644
--- a/frontend/components/Layout/components/Modals.js
+++ b/frontend/components/Layout/components/Modals.js
@@ -8,7 +8,6 @@ import CollectionEdit from 'scenes/CollectionEdit';
 import CollectionDelete from 'scenes/CollectionDelete';
 import DocumentDelete from 'scenes/DocumentDelete';
 import KeyboardShortcuts from 'scenes/KeyboardShortcuts';
-import MarkdownShortcuts from 'scenes/MarkdownShortcuts';
 import Settings from 'scenes/Settings';
 
 @observer class Modals extends Component {
@@ -52,9 +51,6 @@ import Settings from 'scenes/Settings';
         <Modal name="keyboard-shortcuts" title="Keyboard shortcuts">
           <KeyboardShortcuts />
         </Modal>
-        <Modal name="markdown-shortcuts" title="Markdown formatting">
-          <MarkdownShortcuts />
-        </Modal>
         <Modal name="settings" title="Settings">
           <Settings />
         </Modal>
diff --git a/frontend/scenes/KeyboardShortcuts/KeyboardShortcuts.js b/frontend/scenes/KeyboardShortcuts/KeyboardShortcuts.js
index c4cd1df0c..037b05a12 100644
--- a/frontend/scenes/KeyboardShortcuts/KeyboardShortcuts.js
+++ b/frontend/scenes/KeyboardShortcuts/KeyboardShortcuts.js
@@ -10,18 +10,13 @@ function KeyboardShortcuts() {
     <Flex column>
       <HelpText>
         Atlas is designed to be super fast and easy to use.
-        All of your usual keyboard shortcuts work here.
+        All of your usual keyboard shortcuts work here, and there
+        {"'"}
+        s Markdown too.
       </HelpText>
+
+      <h2>Navigation</h2>
       <List>
-        <Keys><Key>Cmd</Key> + <Key>Enter</Key></Keys>
-        <Label>Save and exit document edit mode</Label>
-
-        <Keys><Key>Cmd</Key> + <Key>S</Key></Keys>
-        <Label>Save document and continue editing</Label>
-
-        <Keys><Key>Cmd</Key> + <Key>Esc</Key></Keys>
-        <Label>Cancel editing</Label>
-
         <Keys><Key>e</Key></Keys>
         <Label>Edit current document</Label>
 
@@ -36,9 +31,59 @@ function KeyboardShortcuts() {
 
         <Keys><Key>?</Key></Keys>
         <Label>Open this guide</Label>
+      </List>
 
-        <Keys><Key>#</Key></Keys>
-        <Label>Open markdown guide</Label>
+      <h2>Editor</h2>
+      <List>
+        <Keys><Key>Cmd</Key> + <Key>Enter</Key></Keys>
+        <Label>Save and exit document edit mode</Label>
+        <Keys><Key>Cmd</Key> + <Key>S</Key></Keys>
+        <Label>Save document and continue editing</Label>
+        <Keys><Key>Cmd</Key> + <Key>Esc</Key></Keys>
+        <Label>Cancel editing</Label>
+
+        <Keys><Key>Cmd</Key> + <Key>b</Key></Keys>
+        <Label>Bold</Label>
+        <Keys><Key>Cmd</Key> + <Key>i</Key></Keys>
+        <Label>Italic</Label>
+        <Keys><Key>Cmd</Key> + <Key>u</Key></Keys>
+        <Label>Underline</Label>
+        <Keys><Key>Cmd</Key> + <Key>z</Key></Keys>
+        <Label>Undo</Label>
+        <Keys><Key>Cmd</Key> + <Key>Shift</Key> + <Key>z</Key></Keys>
+        <Label>Redo</Label>
+      </List>
+
+      <h2>Markdown</h2>
+      <List>
+        <Keys><Key>#</Key> <Key>Space</Key></Keys>
+        <Label>Large header</Label>
+        <Keys><Key>##</Key> <Key>Space</Key></Keys>
+        <Label>Medium header</Label>
+        <Keys><Key>###</Key> <Key>Space</Key></Keys>
+        <Label>Small header</Label>
+
+        <Keys><Key>1.</Key> <Key>Space</Key></Keys>
+        <Label>Numbered list</Label>
+        <Keys><Key>-</Key> <Key>Space</Key></Keys>
+        <Label>Bulleted list</Label>
+        <Keys><Key>[ ]</Key> <Key>Space</Key></Keys>
+        <Label>Todo list</Label>
+        <Keys><Key>&gt;</Key> <Key>Space</Key></Keys>
+        <Label>Blockquote</Label>
+        <Keys><Key>---</Key></Keys>
+        <Label>Horizontal divider</Label>
+        <Keys><Key>{'```'}</Key></Keys>
+        <Label>Code block</Label>
+
+        <Keys>_italic_</Keys>
+        <Label>Italic</Label>
+        <Keys>**bold**</Keys>
+        <Label>Bold</Label>
+        <Keys>~~strikethrough~~</Keys>
+        <Label>Strikethrough</Label>
+        <Keys>{'`code`'}</Keys>
+        <Label>Inline code</Label>
       </List>
     </Flex>
   );
diff --git a/frontend/scenes/MarkdownShortcuts/MarkdownShortcuts.js b/frontend/scenes/MarkdownShortcuts/MarkdownShortcuts.js
deleted file mode 100644
index ff84ecf1d..000000000
--- a/frontend/scenes/MarkdownShortcuts/MarkdownShortcuts.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// @flow
-import React from 'react';
-import styled from 'styled-components';
-import Key from 'components/Key';
-import Flex from 'components/Flex';
-import HelpText from 'components/HelpText';
-
-function MarkdownShortcuts() {
-  return (
-    <Flex column>
-      <HelpText>
-        Know a little markdown syntax? You
-        {"'"}
-        re going to love all of the markdown
-        shortcuts built right into the Atlas editor.
-      </HelpText>
-      <List>
-        <Keys><Key>#</Key> <Key>Space</Key></Keys>
-        <Label>Large header</Label>
-        <Keys><Key>##</Key> <Key>Space</Key></Keys>
-        <Label>Medium header</Label>
-        <Keys><Key>###</Key> <Key>Space</Key></Keys>
-        <Label>Small header</Label>
-
-        <Keys><Key>1.</Key> <Key>Space</Key></Keys>
-        <Label>Numbered list</Label>
-        <Keys><Key>-</Key> <Key>Space</Key></Keys>
-        <Label>Bulleted list</Label>
-        <Keys><Key>[ ]</Key> <Key>Space</Key></Keys>
-        <Label>Todo list</Label>
-        <Keys><Key>&gt;</Key> <Key>Space</Key></Keys>
-        <Label>Blockquote</Label>
-        <Keys><Key>---</Key></Keys>
-        <Label>Horizontal divider</Label>
-        <Keys><Key>{'```'}</Key></Keys>
-        <Label>Code block</Label>
-        <Keys>_italic_</Keys>
-        <Label>Italic</Label>
-        <Keys>**bold**</Keys>
-        <Label>Bold</Label>
-        <Keys>~~strikethrough~~</Keys>
-        <Label>Strikethrough</Label>
-        <Keys>{'`code`'}</Keys>
-        <Label>Inline code</Label>
-      </List>
-    </Flex>
-  );
-}
-
-const List = styled.dl`
-  width: 100%;
-  overflow: hidden;
-  padding: 0;
-  margin: 0
-`;
-
-const Keys = styled.dt`
-  float: left;
-  width: 25%;
-  padding: 0 0 4px;
-  margin: 0
-`;
-
-const Label = styled.dd`
-  float: left;
-  width: 75%;
-  padding: 0 0 4px;
-  margin: 0
-`;
-
-export default MarkdownShortcuts;
diff --git a/frontend/scenes/MarkdownShortcuts/index.js b/frontend/scenes/MarkdownShortcuts/index.js
deleted file mode 100644
index 1a6460e75..000000000
--- a/frontend/scenes/MarkdownShortcuts/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-import MarkdownShortcuts from './MarkdownShortcuts';
-export default MarkdownShortcuts;
diff --git a/frontend/styles/base.css b/frontend/styles/base.css
index 27eabf039..d7d50a1f2 100644
--- a/frontend/styles/base.css
+++ b/frontend/styles/base.css
@@ -137,3 +137,7 @@ hr {
 .activeDropZone a {
   color: #FFF !important;
 }
+
+.ReactModal__Body--open {
+  overflow: hidden;
+}