diff --git a/core/modules/edit/css/edit.css b/core/modules/edit/css/edit.css
index ce3d19e..436e024 100644
--- a/core/modules/edit/css/edit.css
+++ b/core/modules/edit/css/edit.css
@@ -131,7 +131,8 @@
 
 #edit_overlay {
   position: fixed;
-  z-index: 250;
+  /* @todo remove edit-overlay, not needed in this model */
+  z-index: -200000;
   width: 100%;
   height: 100%;
   top: 0;
diff --git a/core/modules/edit/js/views/menu-view.js b/core/modules/edit/js/views/menu-view.js
index 0f9ecc8..47e2955 100644
--- a/core/modules/edit/js/views/menu-view.js
+++ b/core/modules/edit/js/views/menu-view.js
@@ -34,6 +34,10 @@ Drupal.edit.views.MenuView = Backbone.View.extend({
     $('#toolbar-administration').on('click.edit', '.bar a:not(#toolbar-tab-edit)', _.bind(function (event) {
       this.model.set('isViewing', true);
     }, this));
+
+    // Add quick edit links to all contextual menus where editing the full node is possible.
+    $('ul.contextual-links li.node-edit').before('<li class="quick-edit"><a href="">' + Drupal.t('Quick edit') + '</a></li>');
+
     // We have to call stateChange() here because URL fragments are not passed
     // to the server, thus the wrong anchor may be marked as active.
     this.stateChange();