diff --git a/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee b/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee
index ea099f8ce..7d07e6f38 100644
--- a/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee
+++ b/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee
@@ -19,6 +19,10 @@ class App.KeyboardShortcutModal extends App.ControllerModal
     return true if @el.parents('html').length > 0
     false
 
+  onClosed: ->
+    return if window.location.hash isnt '#keyboard_shortcuts'
+    window.history.back()
+
 class App.KeyboardShortcutWidget extends Spine.Module
   @include App.LogInclude
 
@@ -143,6 +147,9 @@ App.Config.set(
               description: 'List of shortcuts'
               globalEvent: 'list-of-shortcuts'
               callback: =>
+                if window.location.hash is '#keyboard_shortcuts'
+                  App.Event.trigger('keyboard_shortcuts_close')
+                  return
                 if @dialog && @dialog.exists()
                   @dialog.close()
                   @dialog = false