diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css
index 45dc77b..5bb68b8 100644
--- a/core/modules/overlay/overlay-child.css
+++ b/core/modules/overlay/overlay-child.css
@@ -39,6 +39,10 @@ body.overlay #branding h1.page-title {
   float: none;
 }

+.form-actions input.button-danger, .form-actions #edit-cancel {
+  display: none;
+}
+
 .overlay #skip-link {
   margin-top: -20px;
 }
diff --git a/core/modules/overlay/overlay-parent.js b/core/modules/overlay/overlay-parent.js
index c69425f..9965298 100644
--- a/core/modules/overlay/overlay-parent.js
+++ b/core/modules/overlay/overlay-parent.js
@@ -574,8 +574,12 @@ Drupal.overlay.eventhandlerOverrideLink = function (event) {
     return;
   }

-  // Only open links in the overlay if they are contextual links.
-  if (!$target.parent().parent().hasClass('contextual-links') && !$target.hasClass('button-action') && !$target.parent().hasClass('dropbutton-action')) {
+  // Only open links in the overlay if they are contextual links (but not the
+  // node edit link), or if the link is an action link or dropbutton link
+  // that is already in the overlay.
+  if (!($target.parent().parent().hasClass('contextual-links') && !$target.parent().hasClass('node-edit')) && 
+      !$target.hasClass('button-action') && 
+      !$target.parent().hasClass('dropbutton-action')) {
     return;
   }

diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 6bc94f2..d869bfc 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -146,7 +146,7 @@ function block_menu() {
     'page arguments' => array('block_admin_block_delete', 4),
     'access arguments' => array('administer blocks'),
     'type' => MENU_LOCAL_TASK,
-    'context' => MENU_CONTEXT_NONE,
+    'context' => MENU_CONTEXT_INLINE,
     'file' => 'block.admin.inc',
   );
   // Block administration is actually tied to theme and plugin definition so