diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 5dcb9a07..cb1b4152 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -431,22 +431,23 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
 		}
 	};
 
-	Mousetrap.bind('space', function(e) {
-		$scope.$apply(function() {
-			openNextEntry(e);
-		});
-	});
+
 	Mousetrap.bind('j', function(e) {
 		$scope.$apply(function() {
 			openNextEntry(e);
 		});
 	});
-	Mousetrap.bind('shift+space', function(e) {
+	Mousetrap.bind('k', function(e) {
 		$scope.$apply(function() {
 			openPreviousEntry(e);
 		});
 	});
-	Mousetrap.bind('k', function(e) {
+	Mousetrap.bind('space', function(e) {
+		$scope.$apply(function() {
+			openNextEntry(e);
+		});
+	});
+	Mousetrap.bind('shift+space', function(e) {
 		$scope.$apply(function() {
 			openPreviousEntry(e);
 		});
@@ -475,6 +476,11 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
 			window.open($scope.current.url);
 		}
 	});
+	Mousetrap.bind('?', function(e) {
+		$scope.$apply(function() {
+			$scope.shortcutsModal = true;
+		});
+	});
 
 	$scope.$on('markAll', function(event, args) {
 		var service = $scope.selectedType == 'feed' ? FeedService
diff --git a/src/main/webapp/templates/_shortcuts.html b/src/main/webapp/templates/_shortcuts.html
new file mode 100644
index 00000000..6d271005
--- /dev/null
+++ b/src/main/webapp/templates/_shortcuts.html
@@ -0,0 +1,16 @@
+<dl class="dl-horizontal">
+	<dt>k, space</dt>
+	<dd>open next entry</dd>
+
+	<dt>j, shift+space</dt>
+	<dd>open previous entry</dd>
+
+	<dt>o, enter</dt>
+	<dd>open/close current entry</dd>
+
+	<dt>v</dt>
+	<dd>open current entry in a new window</dd>
+
+	<dt>mouse middleclick</dt>
+	<dd>open entry in new tab and mark as read</dd>
+</dl>
\ No newline at end of file
diff --git a/src/main/webapp/templates/feeds.help.html b/src/main/webapp/templates/feeds.help.html
index 9e1c4205..ef5dcc23 100644
--- a/src/main/webapp/templates/feeds.help.html
+++ b/src/main/webapp/templates/feeds.help.html
@@ -45,22 +45,7 @@
 			</div>
 			<div class="tab-pane" id="shortcuts">
 				<h3>Keyboard Shortcuts</h3>
-				<dl class="dl-horizontal">
-					<dt>k, space</dt>
-					<dd>open next entry</dd>
-					
-					<dt>j, shift+space</dt>
-					<dd>open previous entry</dd>
-					
-					<dt>o, enter</dt>
-					<dd>open/close current entry</dd>
-					
-					<dt>v</dt>
-					<dd>open current entry in a new window</dd>
-					
-					<dt>mouse middleclick</dt>
-					<dd>open entry in new tab and mark as read</dd>
-				</dl>
+				<div ng-include="'templates/_shortcuts.html'"></div>
 			</div>
 		</div>
 	</div>
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 117248bd..bcfa391b 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -1,5 +1,4 @@
 <div>
-
 	<div class="entrylist-header" ui-if="name">
 		<h3><span>{{name}}&nbsp;</span><span ng-show="name && selectedType == 'category'"> &#187;</span></h3>
 	</div>
@@ -39,5 +38,12 @@
 			</div>
 		</div>
 		<div class="no-entries" ng-show="name && entries.length == 0 && !busy">"{{name}}" has no unread items.</div>
+		<div modal="shortcutsModal" close="shortcutsModal=false" options="shortcutsOpts">
+		<div class="modal-header">
+			<button type="button" class="close" ng-click="shortcutsModal=false">&times;</button>
+			<h4>Keyboard shortcuts</h4>
+		</div>
+		<div ng-include="'templates/_shortcuts.html'"></div>
+	</div>
 	</div>
 </div>
\ No newline at end of file