diff -u modules/shortcut/shortcut.module modules/shortcut/shortcut.module
--- modules/shortcut/shortcut.module	15 Oct 2009 21:11:02 -0000
+++ modules/shortcut/shortcut.module	15 Oct 2009 21:58:46 -0000
@@ -478,7 +478,7 @@
  * Implement hook_page_build().
  */
 function shortcut_page_build(&$page) {
-  if (user_access('customize shortcut links')) {
+  if (shortcut_set_edit_access()) {
     // $_GET['q'] is the unaliased version.
     $get = $_GET;
     unset($get['q']);
@@ -506,6 +506,7 @@
   $links['#attached'] = array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css'));
   $links['#prefix'] = '<div class="toolbar-shortcuts">';
   $links['#suffix'] = '</div>';
+  $shortcut_set = shortcut_current_displayed_set();
   $configure_link = array('#markup' => l(t('edit shortcuts'), 'admin/config/system/shortcut/' . $shortcut_set->set_name, array('attributes' => array('id' => 'toolbar-customize'))));
 
   $drawer = array(