diff -u modules/shortcut/shortcut.install modules/shortcut/shortcut.install
--- modules/shortcut/shortcut.install
+++ modules/shortcut/shortcut.install
@@ -1,6 +1,7 @@
 <?php
 // $Id$
 
+define('SHORTCUT_DEFAULT_SET_NAME', 'shortcut-set-1');
 /**
  * @file
  * Install, update and uninstall functions for the shortcut module.
@@ -10,6 +11,15 @@
  * Implement hook_install().
  */
 function shortcut_install() {
+  
+}
+
+function shortcut_enable() {
+  if (shortcut_set_load(SHORTCUT_DEFAULT_SET_NAME)) {
+    // Quit out, this module has already been installed.
+    return;
+  }
+  
   $t = get_t();
   // Create an initial default shortcut set.
   $shortcut_set = new stdClass();
diff -u modules/shortcut/shortcut.module modules/shortcut/shortcut.module
--- modules/shortcut/shortcut.module
+++ modules/shortcut/shortcut.module
@@ -195,6 +195,10 @@
   }
   // If none was found, try to find a shortcut set that is explicitly assigned
   // to this user.
+
+  return shortcut_default_set($account);
+
+  // JS: This is currently broken
   $shortcut_set = db_select('shortcut_set', 's')
     ->fields('s')
     ->join('shortcut_set_users', 'u', 's.set_name = u.set_name')
@@ -226,7 +230,7 @@
   // Allow modules to return a default shortcut set name. Since we can only
   // have one, we take the first valid result we get. If we don't find one,
   // fall back on the site-wide default.
-  $shortcut_set_names = array_merge(module_invoke_all('shortcut_default_set_name', $account), variable_get('shortcut_default_set_name', shortcut_set_name()));
+  $shortcut_set_names = array_merge(module_invoke_all('shortcut_default_set_name', $account), array(variable_get('shortcut_default_set_name', shortcut_set_name())));
   foreach ($shortcut_set_names as $name) {
     if ($shortcut_set = shortcut_set_load($name)) {
       break;