diff --git a/CHANGELOG.md b/CHANGELOG.md
index e501c2ad2..4be4193a0 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
 The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
 
 <!-- v1.9.18.x -->
+### v1.9.18.6 
+*2014-12-31* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.6/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+Fix short threads at the bottom of the page not being selectable by keybinds.
+
 ### v1.9.18.5 
 *2014-12-30* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.5/builds/4chan-X-noupdate.crx "Chromium version")]
 
diff --git a/LICENSE b/LICENSE
index 35b4b3a48..94aa149bd 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.9.18.5
+* 4chan X - Version 1.9.18.6
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 2f89a1028..7c17fcbf9 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index bdaeaf076..219ff9361 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.9.18.5
+// @version      1.9.18.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index d33f53c6b..53824bd6d 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.9.18.5
+// @version      1.9.18.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.18.5
+* 4chan X - Version 1.9.18.6
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -395,7 +395,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.18.5',
+    VERSION: '1.9.18.6',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14425,7 +14425,7 @@
       return $('.board');
     },
     scroll: function(delta) {
-      var axis, next, thread, top;
+      var axis, extra, next, thread, top;
       thread = Nav.getThread();
       axis = delta === +1 ? 'following' : 'preceding';
       if (next = $.x("" + axis + "-sibling::div[contains(@class,'thread') and not(@hidden)][1]", thread)) {
@@ -14434,7 +14434,26 @@
           thread = next;
         }
       }
-      return Header.scrollTo(thread);
+      extra = Header.getTopOf(thread) + doc.clientHeight - d.body.getBoundingClientRect().bottom;
+      if (extra > 0) {
+        d.body.style.marginBottom = "" + extra + "px";
+      }
+      Header.scrollTo(thread);
+      if (extra > 0 && !Nav.haveExtra) {
+        Nav.haveExtra = true;
+        return $.on(d, 'scroll', Nav.removeExtra);
+      }
+    },
+    removeExtra: function() {
+      var extra;
+      extra = doc.clientHeight - d.body.getBoundingClientRect().bottom;
+      if (extra > 0) {
+        return d.body.style.marginBottom = "" + extra + "px";
+      } else {
+        d.body.style.marginBottom = null;
+        delete Nav.haveExtra;
+        return $.off(d, 'scroll', Nav.removeExtra);
+      }
     }
   };
 
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 4ae8657f9..121a3249a 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 14e94e5c8..ebbd84623 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.18.5
+// @version      1.9.18.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.18.5
+* 4chan X - Version 1.9.18.6
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -394,7 +394,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.18.5',
+    VERSION: '1.9.18.6',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14424,7 +14424,7 @@
       return $('.board');
     },
     scroll: function(delta) {
-      var axis, next, thread, top;
+      var axis, extra, next, thread, top;
       thread = Nav.getThread();
       axis = delta === +1 ? 'following' : 'preceding';
       if (next = $.x("" + axis + "-sibling::div[contains(@class,'thread') and not(@hidden)][1]", thread)) {
@@ -14433,7 +14433,26 @@
           thread = next;
         }
       }
-      return Header.scrollTo(thread);
+      extra = Header.getTopOf(thread) + doc.clientHeight - d.body.getBoundingClientRect().bottom;
+      if (extra > 0) {
+        d.body.style.marginBottom = "" + extra + "px";
+      }
+      Header.scrollTo(thread);
+      if (extra > 0 && !Nav.haveExtra) {
+        Nav.haveExtra = true;
+        return $.on(d, 'scroll', Nav.removeExtra);
+      }
+    },
+    removeExtra: function() {
+      var extra;
+      extra = doc.clientHeight - d.body.getBoundingClientRect().bottom;
+      if (extra > 0) {
+        return d.body.style.marginBottom = "" + extra + "px";
+      } else {
+        d.body.style.marginBottom = null;
+        delete Nav.haveExtra;
+        return $.off(d, 'scroll', Nav.removeExtra);
+      }
     }
   };
 
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index a99b41062..49b924ed2 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 5f3639b64..022194578 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.18.5
+// @version      1.9.18.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 257152557..df3d6d360 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.18.5
+// @version      1.9.18.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.18.5
+* 4chan X - Version 1.9.18.6
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -395,7 +395,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.18.5',
+    VERSION: '1.9.18.6',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14425,7 +14425,7 @@
       return $('.board');
     },
     scroll: function(delta) {
-      var axis, next, thread, top;
+      var axis, extra, next, thread, top;
       thread = Nav.getThread();
       axis = delta === +1 ? 'following' : 'preceding';
       if (next = $.x("" + axis + "-sibling::div[contains(@class,'thread') and not(@hidden)][1]", thread)) {
@@ -14434,7 +14434,26 @@
           thread = next;
         }
       }
-      return Header.scrollTo(thread);
+      extra = Header.getTopOf(thread) + doc.clientHeight - d.body.getBoundingClientRect().bottom;
+      if (extra > 0) {
+        d.body.style.marginBottom = "" + extra + "px";
+      }
+      Header.scrollTo(thread);
+      if (extra > 0 && !Nav.haveExtra) {
+        Nav.haveExtra = true;
+        return $.on(d, 'scroll', Nav.removeExtra);
+      }
+    },
+    removeExtra: function() {
+      var extra;
+      extra = doc.clientHeight - d.body.getBoundingClientRect().bottom;
+      if (extra > 0) {
+        return d.body.style.marginBottom = "" + extra + "px";
+      } else {
+        d.body.style.marginBottom = null;
+        delete Nav.haveExtra;
+        return $.off(d, 'scroll', Nav.removeExtra);
+      }
     }
   };
 
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 268d84203..110e4cd0c 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 25106ee03..5bd82b459 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.18.5' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.18.6' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index ee6ad272b..4d0c83bbb 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.18.5' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.18.6' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 695cf2ea0..35523c58e 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.9.18.5",
+    "version": "1.9.18.6",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",