diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb8274daa..e88c01c04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ## v1.13.0
 
+**v1.13.0.21** *(2016-11-06)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.21/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.21/builds/4chan-X-noupdate.crx)]
+- Prevent hovered catalog threads from going offscreen if the extra padding on `.board` is removed.
+
 **v1.13.0.20** *(2016-11-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.20/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.20/builds/4chan-X-noupdate.crx)]
 - Bugfix: Don't add embedding window to error pages.
 - Hide EXIF data in /p/ catalog except on hover.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 6b2af4bb7..50b25682d 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 c0057822a..2fc5d2f8f 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.13.0.20
+// @version      1.13.0.21
 // @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 08aae1df6..6ed37c88b 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.0.20
+// @version      1.13.0.21
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.0.20',
+  VERSION:   '1.13.0.21',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -1898,7 +1898,7 @@ div[data-checked=\"false\"] > .suboption-list {\n\
 /* Catalog */\n\
 :root.catalog-mode .board {\n\
   text-align: center;\n\
-  padding: 0 50px;\n\
+  padding: 0 51px;\n\
 }\n\
 .catalog-thread {\n\
   display: inline-block;\n\
@@ -9608,6 +9608,21 @@ Index = (function() {
           return;
         }
         return Index.buildCatalogReplies(Get.threadFromRoot(this));
+      },
+      hoverAdjust: function() {
+        var rect, style, x;
+        if (!Conf['Catalog Hover Expand']) {
+          return;
+        }
+        rect = this.post.getBoundingClientRect();
+        if ((x = $.minmax(0, -rect.left, doc.clientWidth - rect.right))) {
+          style = this.post.style;
+          style.left = x + "px";
+          style.right = (-x) + "px";
+          return $.one(this.root, 'mouseleave', function() {
+            return style.left = style.right = null;
+          });
+        }
       }
     },
     scrollToIndex: function() {
@@ -10347,6 +10362,7 @@ Index = (function() {
         if (Conf['Show Replies'] && Conf['Catalog Hover Expand']) {
           $.on(thread.catalogView.nodes.root, 'mouseover', Index.cb.catalogReplies);
         }
+        $.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes));
       }
       $.add(Index.root, nodes);
       return nodes;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 2bf92b88c..fc560b9dd 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 e2e0da38b..7f22b3852 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.0.20
+// @version      1.13.0.21
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.0.20',
+  VERSION:   '1.13.0.21',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -1898,7 +1898,7 @@ div[data-checked=\"false\"] > .suboption-list {\n\
 /* Catalog */\n\
 :root.catalog-mode .board {\n\
   text-align: center;\n\
-  padding: 0 50px;\n\
+  padding: 0 51px;\n\
 }\n\
 .catalog-thread {\n\
   display: inline-block;\n\
@@ -9608,6 +9608,21 @@ Index = (function() {
           return;
         }
         return Index.buildCatalogReplies(Get.threadFromRoot(this));
+      },
+      hoverAdjust: function() {
+        var rect, style, x;
+        if (!Conf['Catalog Hover Expand']) {
+          return;
+        }
+        rect = this.post.getBoundingClientRect();
+        if ((x = $.minmax(0, -rect.left, doc.clientWidth - rect.right))) {
+          style = this.post.style;
+          style.left = x + "px";
+          style.right = (-x) + "px";
+          return $.one(this.root, 'mouseleave', function() {
+            return style.left = style.right = null;
+          });
+        }
       }
     },
     scrollToIndex: function() {
@@ -10347,6 +10362,7 @@ Index = (function() {
         if (Conf['Show Replies'] && Conf['Catalog Hover Expand']) {
           $.on(thread.catalogView.nodes.root, 'mouseover', Index.cb.catalogReplies);
         }
+        $.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes));
       }
       $.add(Index.root, nodes);
       return nodes;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index d9c0da07f..19dfeda98 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 17e679e03..5d94f8af0 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.0.20
+// @version      1.13.0.21
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 83fb30c6f..77e4b77ac 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.0.20
+// @version      1.13.0.21
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.0.20',
+  VERSION:   '1.13.0.21',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -1898,7 +1898,7 @@ div[data-checked=\"false\"] > .suboption-list {\n\
 /* Catalog */\n\
 :root.catalog-mode .board {\n\
   text-align: center;\n\
-  padding: 0 50px;\n\
+  padding: 0 51px;\n\
 }\n\
 .catalog-thread {\n\
   display: inline-block;\n\
@@ -9608,6 +9608,21 @@ Index = (function() {
           return;
         }
         return Index.buildCatalogReplies(Get.threadFromRoot(this));
+      },
+      hoverAdjust: function() {
+        var rect, style, x;
+        if (!Conf['Catalog Hover Expand']) {
+          return;
+        }
+        rect = this.post.getBoundingClientRect();
+        if ((x = $.minmax(0, -rect.left, doc.clientWidth - rect.right))) {
+          style = this.post.style;
+          style.left = x + "px";
+          style.right = (-x) + "px";
+          return $.one(this.root, 'mouseleave', function() {
+            return style.left = style.right = null;
+          });
+        }
       }
     },
     scrollToIndex: function() {
@@ -10347,6 +10362,7 @@ Index = (function() {
         if (Conf['Show Replies'] && Conf['Catalog Hover Expand']) {
           $.on(thread.catalogView.nodes.root, 'mouseover', Index.cb.catalogReplies);
         }
+        $.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes));
       }
       $.add(Index.root, nodes);
       return nodes;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index f4634851a..ba72f0ee2 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 8a99105f3..c83e786b9 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://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.0.20' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.0.21' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index dcc2522df..8f977d8f4 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://www.4chan-x.net/builds/4chan-X.crx' version='1.13.0.20' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.0.21' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 9fd0d334f..6322e7239 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.13.0.20",
-  "date": "2016-11-05T00:00:58.595Z"
+  "version": "1.13.0.21",
+  "date": "2016-11-06T23:12:41.993Z"
 }
\ No newline at end of file