Merge branch 'master' into disabled-publish

frontend/components/Editor/plugins.js

@@ -1,5 +1,5 @@
 // @flow
-import DropOrPasteImages from 'slate-drop-or-paste-images';
+import DropOrPasteImages from '@tommoor/slate-drop-or-paste-images';
 import PasteLinkify from 'slate-paste-linkify';
 import EditList from 'slate-edit-list';
 import CollapseOnEscape from 'slate-collapse-on-escape';

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 = () => {