diff --git a/src/app/partials/help_modal.html b/src/app/partials/help_modal.html
index 8fca3680fa0..866d44898eb 100644
--- a/src/app/partials/help_modal.html
+++ b/src/app/partials/help_modal.html
@@ -36,6 +36,10 @@
 				<td><span class="label label-info">CTRL+R</span></td>
 				<td>Refresh (Fetches new data and rerenders panels)</td>
 			</tr>
+			<tr>
+				<td><span class="label label-info">CTRL+O</span></td>
+				<td>Enable/Disable shared graph crosshair</td>
+			</tr>
 		</table>
 	</div>
 
diff --git a/src/app/services/dashboard/dashboardKeyBindings.js b/src/app/services/dashboard/dashboardKeyBindings.js
index c87b07db622..d5e0c1609c0 100644
--- a/src/app/services/dashboard/dashboardKeyBindings.js
+++ b/src/app/services/dashboard/dashboardKeyBindings.js
@@ -23,7 +23,7 @@ function(angular, $) {
       });
 
       var helpModalScope = null;
-      keyboardManager.bind('shift+¿', function() {
+      keyboardManager.bind('shift+?', function() {
         if (helpModalScope) { return; }
 
         helpModalScope = $rootScope.$new();
diff --git a/src/app/services/keyboardManager.js b/src/app/services/keyboardManager.js
index 72124fe76af..10d5db03f45 100644
--- a/src/app/services/keyboardManager.js
+++ b/src/app/services/keyboardManager.js
@@ -61,6 +61,7 @@ function (angular) {
         else if (e.which) {
           code = e.which;
         }
+
         var character = String.fromCharCode(code).toLowerCase();
 
         if (code === 188) {
@@ -93,6 +94,9 @@ function (angular) {
           ",": "<",
           ".": ">",
           "/": "?",
+          "»": "?",
+          "«": "?",
+          "¿": "?",
           "\\": "|"
         };
         // Special Keys - and their codes