diff --git a/modules/shortcut/shortcut.admin.inc b/modules/shortcut/shortcut.admin.inc
index 91ce7c8..2af6e48 100644
--- a/modules/shortcut/shortcut.admin.inc
+++ b/modules/shortcut/shortcut.admin.inc
@@ -423,6 +423,19 @@ function shortcut_link_add($form, &$form_state, $shortcut_set) {
     '#value' => $shortcut_set,
   );
   $form += _shortcut_link_form_elements();
+
+  $shortcuts_enabled = 0;
+  $shortcut_limit = shortcut_max_slots();
+  if (!empty($shortcut_set->links)) {
+    foreach ($shortcut_set->links as $link) {
+      if (!$link['hidden']) {
+        $shortcuts_enabled++;
+      }
+    }
+    if ($shortcuts_enabled >= $shortcut_limit) {
+      drupal_set_message(t('Only @limit links can be enabled in the shortcut menu. New shortcut links will replace the last enabled shortcut in the list.', array('@limit' => $shortcut_limit)), 'warning');
+    }
+  }
   return $form;
 }