diff --git a/assets/javascripts/app/shortcuts.coffee b/assets/javascripts/app/shortcuts.coffee
index 74f7b0f5..0bdb8e95 100644
--- a/assets/javascripts/app/shortcuts.coffee
+++ b/assets/javascripts/app/shortcuts.coffee
@@ -61,9 +61,9 @@ class app.Shortcuts
       when 34
         @trigger 'pageDown'
       when 35
-        @trigger 'end'
+        @trigger 'pageBottom' unless event.target.form
       when 36
-        @trigger 'home'
+        @trigger 'pageTop' unless event.target.form
       when 37
         @trigger 'left' unless event.target.value
       when 38
@@ -86,14 +86,14 @@ class app.Shortcuts
           @trigger 'superLeft'
           false
       when 38
-        @trigger 'home'
+        @trigger 'pageTop'
         false
       when 39
         unless @isWindows
           @trigger 'superRight'
           false
       when 40
-        @trigger 'end'
+        @trigger 'pageBottom'
         false
 
   handleKeydownShiftEvent: (event) ->
diff --git a/assets/javascripts/views/content/content.coffee b/assets/javascripts/views/content/content.coffee
index f2a288e8..40079423 100644
--- a/assets/javascripts/views/content/content.coffee
+++ b/assets/javascripts/views/content/content.coffee
@@ -6,13 +6,13 @@ class app.views.Content extends app.View
     click: 'onClick'
 
   @shortcuts:
-    altUp:    'scrollStepUp'
-    altDown:  'scrollStepDown'
-    pageUp:   'scrollPageUp'
-    pageDown: 'scrollPageDown'
-    home:     'scrollToTop'
-    end:      'scrollToBottom'
-    altF:     'onAltF'
+    altUp:      'scrollStepUp'
+    altDown:    'scrollStepDown'
+    pageUp:     'scrollPageUp'
+    pageDown:   'scrollPageDown'
+    pageTop:    'scrollToTop'
+    pageBottom: 'scrollToBottom'
+    altF:       'onAltF'
 
   @routes:
     before: 'beforeRoute'