diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 636d9b2..344ffe7 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -946,8 +946,9 @@ function _block_get_renderable_block($element) {

     // Add the content renderable array to the main element.
     $element['content'] = $block->content;
-    if (isset($block->content['#contextual_links']))
+    if (isset($block->content['#contextual_links'])) {
       $element['#contextual_links'] = $block->content['#contextual_links'];
+    }
     unset($block->content);
     $element['#block'] = $block;
   }
diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualLinksTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualLinksTest.php
index d8a12b5..0b9a3e8 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualLinksTest.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualLinksTest.php
@@ -19,7 +19,7 @@ class ContextualLinksTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('contextual', 'menu');
+  public static $modules = array('contextual', 'menu', 'block');

   public static function getInfo() {
     return array(
@@ -31,7 +31,7 @@ public static function getInfo() {

   public function setUp() {
     parent::setUp();
-    $web_user = $this->drupalCreateUser(array('access content', 'access contextual links', 'administer blocks'));
+    $web_user = $this->drupalCreateUser(array('access content', 'access contextual links', 'administer blocks', 'administer menu'));
     $this->drupalLogin($web_user);
   }

@@ -39,10 +39,17 @@ public function setUp() {
    * Tests contextual links on Navigation Menu with different users.
    */
   public function testNavigationBlock() {
+    // Place the main menu in the sidebar first region.
+    $edit = array('regions[stark]' => 'sidebar_first');
+    $this->drupalPost('admin/structure/block/manage/system/menu-main/configure', $edit, t('Save block'));
+    // Add a link to the empty main menu.
+    $edit = array('link_title' => 'Home', 'link_path' => '<front>');
+    $this->drupalPost('admin/structure/menu/manage/main/add', $edit, t('Save'));
+
     // Make sure the block is visible on the front page to the logged in user.
     $this->drupalGet('node');
-    $this->assertLinkByHref('admin/structure/menu/manage/navigation/list?destination=node', 0, 'List Links link for navigation menu is displayed.');
-    $this->assertLinkByHref('admin/structure/menu/manage/navigation/edit?destination=node', 0, 'Edit menu link for navigation menu is displayed.');
-    $this->assertLinkByHref('admin/structure/block/manage/system/navigation/configure', 0, 'Configure block link for navigation menu is displayed.');
+    $this->assertLinkByHref('admin/structure/menu/manage/main/list?destination=node', 0, 'List Links link for main menu is displayed.');
+    $this->assertLinkByHref('admin/structure/menu/manage/main/edit?destination=node', 0, 'Edit menu link for main menu is displayed.');
+    $this->assertLinkByHref('admin/structure/block/manage/system/menu-main/configure', 0, 'Configure block link for main menu is displayed.');
   }
 }