diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutLinkAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutLinkAccessCheck.php
index 6a35445..45ade59 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutLinkAccessCheck.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Access/ShortcutLinkAccessCheck.php
@@ -40,7 +40,7 @@ public function access(Route $route, Request $request) {
             return static::ALLOW;
           }
           if (user_access('customize shortcut links')) {
-            return $shortcut == shortcut_current_displayed_set();
+            return $shortcut == shortcut_current_displayed_set() ? static::ALLOW : static::DENY;
           }
           break;
       }
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkAdd.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkAdd.php
index c225f62..e79172c 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkAdd.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkAdd.php
@@ -106,8 +106,8 @@ public function submitForm(array &$form, array &$form_state) {
    * @return
    *   An array of form elements.
    */
-  public function getFormElements($shortcut_link = NULL) {
-    if (!isset($shortcut_link)) {
+  public function getFormElements(array $shortcut_link = array()) {
+    if (empty($shortcut_link)) {
       $shortcut_link = $this->entityManager
         ->getStorageController('menu_link')
         ->create(array(