diff --git a/res/static/script/Keyboard.js b/res/static/script/Keyboard.js
index ac95b71..3dcf432 100644
--- a/res/static/script/Keyboard.js
+++ b/res/static/script/Keyboard.js
@@ -5,17 +5,32 @@ $(document).keydown(function(event){
 		return // prevent custom shortcuts from interfering with system shortcuts
 	}
 
-	if(event.which === 65 || event.which === 37){ // A or left arrow key go to previous file
+	switch (event.which) {
+	case 65: // A or left arrow key go to previous file
+	case 37:
 		ListNavigator.previousItem();
-	}else if(event.which === 68 || event.which === 39){ // D or right arrow key go to next file
+		break;
+	case 68: // D or right arrow key go to next file
+	case 39:
 		ListNavigator.nextItem();
-	}else if(event.shiftKey && event.which === 83){ // SHIFT + S downloads all files in list
-		Toolbar.downloadList();
-	}else if(event.which === 83){ // S key downloads only selected file
-		Toolbar.download();
-	}else if(event.which === 67){ // C to copy to clipboard
+	case 83: 
+		if (event.shiftKey) {
+			Toolbar.downloadList(); // SHIFT + S downloads all files in list
+		} else {
+			Toolbar.download(); // S to download the current file
+		}
+		break;
+	case 82: // R to toggle list shuffle
+		ListNavigator.toggleShuffle();
+		break;
+	case 67: // C to copy to clipboard
 		Toolbar.copyUrl();
-	}else if(event.which === 73){ // I to open info window
+		break;
+	case 73: // I to open the details window
 		DetailsWindow.toggle();
+		break;
+	case 81: // Q to close the window
+		window.close();
+		break;
 	}
 });
diff --git a/res/template/file_viewer.html b/res/template/file_viewer.html
index ba33d81..c5307b3 100644
--- a/res/template/file_viewer.html
+++ b/res/template/file_viewer.html
@@ -130,8 +130,9 @@
 					<table>
 						<tr><td colspan="2">File Shortcuts</td></tr>
 						<tr><td>c</td><td> = Copy URL of this page</td></tr>
-						<tr><td>i</td><td> = Toggle details window (this window)</td></tr>
-						<tr><td>s</td><td> = Download the file you are currently viewing</td></tr>
+						<tr><td>i</td><td> = Toggle details window (this window) (<b><u>i</u></b>nfo)</td></tr>
+						<tr><td>s</td><td> = Download the file you are currently viewing (<b><u>s</u></b>ave)</td></tr>
+						<tr><td>q</td><td> = Close the window (<b><u>q</u></b>uit)</td></tr>
 						<tr><td colspan="2">List Shortcuts</td></tr>
 						<tr><td>a or &#8592;</td><td> = View previous item in list</td></tr>
 						<tr><td>d or &#8594;</td><td> = View next item in list</td></tr>