diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index df8f3c27f..e24723eeb 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -282,11 +282,11 @@
       'fappeTyme': ['f', 'Fappe Tyme.'],
       'Front page': ['0', 'Jump to page 0.'],
       'Open front page': ['Shift+0', 'Open page 0 in a new tab.'],
-      'Next page': ['Right', 'Jump to the next page.'],
-      'Previous page': ['Left', 'Jump to the previous page.'],
+      'Next page': ['Shift+Right', 'Jump to the next page.'],
+      'Previous page': ['Shift+Left', 'Jump to the previous page.'],
       'Open catalog': ['Shift+c', 'Open the catalog of the current board'],
-      'Next thread': ['Down', 'See next thread.'],
-      'Previous thread': ['Up', 'See previous thread.'],
+      'Next thread': ['Shift+Down', 'See next thread.'],
+      'Previous thread': ['Shift+Up', 'See previous thread.'],
       'Expand thread': ['Ctrl+e', 'Expand thread.'],
       'Open thread': ['o', 'Open thread in current tab.'],
       'Open thread tab': ['Shift+o', 'Open thread in new tab.'],
@@ -8828,11 +8828,17 @@
           $.open("/" + g.BOARD + "/#delform");
           break;
         case Conf['Next page']:
+          if (g.VIEW === 'thread') {
+            return;
+          }
           if (form = $('.next form')) {
             window.location = form.action;
           }
           break;
         case Conf['Previous page']:
+          if (g.VIEW === 'thread') {
+            return;
+          }
           if (form = $('.prev form')) {
             window.location = form.action;
           }
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 3e946c90b..ec333739d 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -283,11 +283,11 @@
       'fappeTyme': ['f', 'Fappe Tyme.'],
       'Front page': ['0', 'Jump to page 0.'],
       'Open front page': ['Shift+0', 'Open page 0 in a new tab.'],
-      'Next page': ['Right', 'Jump to the next page.'],
-      'Previous page': ['Left', 'Jump to the previous page.'],
+      'Next page': ['Shift+Right', 'Jump to the next page.'],
+      'Previous page': ['Shift+Left', 'Jump to the previous page.'],
       'Open catalog': ['Shift+c', 'Open the catalog of the current board'],
-      'Next thread': ['Down', 'See next thread.'],
-      'Previous thread': ['Up', 'See previous thread.'],
+      'Next thread': ['Shift+Down', 'See next thread.'],
+      'Previous thread': ['Shift+Up', 'See previous thread.'],
       'Expand thread': ['Ctrl+e', 'Expand thread.'],
       'Open thread': ['o', 'Open thread in current tab.'],
       'Open thread tab': ['Shift+o', 'Open thread in new tab.'],
@@ -8837,11 +8837,17 @@
           $.open("/" + g.BOARD + "/#delform");
           break;
         case Conf['Next page']:
+          if (g.VIEW === 'thread') {
+            return;
+          }
           if (form = $('.next form')) {
             window.location = form.action;
           }
           break;
         case Conf['Previous page']:
+          if (g.VIEW === 'thread') {
+            return;
+          }
           if (form = $('.prev form')) {
             window.location = form.action;
           }
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 4df2390c7..7803ae6dd 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -264,11 +264,11 @@
       'fappeTyme': ['f', 'Fappe Tyme.'],
       'Front page': ['0', 'Jump to page 0.'],
       'Open front page': ['Shift+0', 'Open page 0 in a new tab.'],
-      'Next page': ['Right', 'Jump to the next page.'],
-      'Previous page': ['Left', 'Jump to the previous page.'],
+      'Next page': ['Shift+Right', 'Jump to the next page.'],
+      'Previous page': ['Shift+Left', 'Jump to the previous page.'],
       'Open catalog': ['Shift+c', 'Open the catalog of the current board'],
-      'Next thread': ['Down', 'See next thread.'],
-      'Previous thread': ['Up', 'See previous thread.'],
+      'Next thread': ['Shift+Down', 'See next thread.'],
+      'Previous thread': ['Shift+Up', 'See previous thread.'],
       'Expand thread': ['Ctrl+e', 'Expand thread.'],
       'Open thread': ['o', 'Open thread in current tab.'],
       'Open thread tab': ['Shift+o', 'Open thread in new tab.'],
@@ -8820,11 +8820,17 @@
           $.open("/" + g.BOARD + "/#delform");
           break;
         case Conf['Next page']:
+          if (g.VIEW === 'thread') {
+            return;
+          }
           if (form = $('.next form')) {
             window.location = form.action;
           }
           break;
         case Conf['Previous page']:
+          if (g.VIEW === 'thread') {
+            return;
+          }
           if (form = $('.prev form')) {
             window.location = form.action;
           }
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index e615e3636..d403e0b8f 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -567,11 +567,11 @@ http://iqdb.org/?url=%TURL
       'Open page 0 in a new tab.'
     ]
     'Next page': [
-      'Right'
+      'Shift+Right'
       'Jump to the next page.'
     ]
     'Previous page': [
-      'Left'
+      'Shift+Left'
       'Jump to the previous page.'
     ]
     'Open catalog': [
@@ -580,11 +580,11 @@ http://iqdb.org/?url=%TURL
     ]
     # Thread Navigation
     'Next thread': [
-      'Down'
+      'Shift+Down'
       'See next thread.'
     ]
     'Previous thread': [
-      'Up'
+      'Shift+Up'
       'See previous thread.'
     ]
     'Expand thread': [
diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index d64fbc49e..0c4f70f04 100644
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -81,9 +81,11 @@ Keybinds =
       when Conf['Open front page']
         $.open "/#{g.BOARD}/#delform"
       when Conf['Next page']
+        return if g.VIEW is 'thread'
         if form = $ '.next form'
           window.location = form.action
       when Conf['Previous page']
+        return if g.VIEW is 'thread'
         if form = $ '.prev form'
           window.location = form.action
       when Conf['Open catalog']