diff --git a/js/HuesCore.js b/js/HuesCore.js
index c75f775..aabeab7 100644
--- a/js/HuesCore.js
+++ b/js/HuesCore.js
@@ -172,8 +172,7 @@ function HuesCore(defaults) {
     document.onkeydown = function(e){
         e = e || window.event;
         // Ignore modifiers so we don't steal other events
-        // Shift is actually used, and is thus ignored here
-        if (e.altKey || e.ctrlKey || e.metaKey) {
+        if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
             return true;
         }
         // If we've focused a text input, let the input go through!
@@ -843,7 +842,7 @@ HuesCore.prototype.keyHandler = function(key) {
     case 87: // W
         this.settings.toggle();
         break;
-    case 16: // SHIFT
+    case 78: // N
         this.randomSong();
         break;
     default:
diff --git a/js/HuesInfo.js b/js/HuesInfo.js
index 07a9dd1..33f732b 100644
--- a/js/HuesInfo.js
+++ b/js/HuesInfo.js
@@ -52,7 +52,7 @@ var beatGlossary = [
 var shortcuts = [
     "↑↓  Change song",
     "←→  Change image",
-    "[SHIFT] Random song",
+    "[N] Random song",
     "-+  Change volume",
     "[M] Toggle mute",
     "[F] Toggle automode",