diff --git a/frontend/components/Layout/Layout.js b/frontend/components/Layout/Layout.js
index b22c3eae..9679eb83 100644
--- a/frontend/components/Layout/Layout.js
+++ b/frontend/components/Layout/Layout.js
@@ -69,9 +69,13 @@ type Props = {
   }
 
   @keydown('e')
-  goToEdit() {
-    if (!this.props.documents.active) return;
-    this.props.history.push(documentEditUrl(this.props.documents.active));
+  goToEdit(ev) {
+    const activeDocument = this.props.documents.active;
+    if (!activeDocument) return;
+
+    ev.preventDefault();
+    ev.stopPropagation();
+    this.props.history.push(documentEditUrl(activeDocument));
   }
 
   handleLogout = () => {
diff --git a/frontend/components/Layout/components/HeaderAction/HeaderAction.scss b/frontend/components/Layout/components/HeaderAction/HeaderAction.scss
index 5e7bbec4..cc501390 100644
--- a/frontend/components/Layout/components/HeaderAction/HeaderAction.scss
+++ b/frontend/components/Layout/components/HeaderAction/HeaderAction.scss
@@ -2,7 +2,6 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  cursor: pointer;
   min-height: 43px;
   padding: 0 0.5rem;
 
diff --git a/frontend/components/Layout/components/SaveAction/SaveAction.js b/frontend/components/Layout/components/SaveAction/SaveAction.js
index ff307acb..f33cfec4 100644
--- a/frontend/components/Layout/components/SaveAction/SaveAction.js
+++ b/frontend/components/Layout/components/SaveAction/SaveAction.js
@@ -26,10 +26,9 @@ class SaveAction extends React.Component {
 
     return (
       <Link
-        href
         onClick={this.onClick}
-        style={{ opacity: disabled ? 0.5 : 1 }}
         title="Save changes (Cmd+Enter)"
+        disabled={disabled}
       >
         {showCheckmark && <SavedIcon />}
         {isNew ? 'Publish' : 'Save'}
@@ -41,6 +40,9 @@ class SaveAction extends React.Component {
 const Link = styled.a`
   display: flex;
   align-items: center;
+  opacity: ${props => (props.disabled ? 0.5 : 1)};
+  pointer-events: ${props => (props.disabled ? 'none' : 'auto')};
+  cursor: ${props => (props.disabled ? 'default' : 'pointer')};
 `;
 
 const SavedIcon = styled(CheckIcon)`