diff --git a/CHANGELOG.md b/CHANGELOG.md
index 315e1f7aa..e53b2983d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,9 @@ The links to individual versions below are to copies of the script with the upda
 
 ## v1.10.0
 
+**v1.10.0.6** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.crx "Chromium version")]
+- Fix bugs when `Fixed Header` is off but `Bottom Header` is on.
+
 **v1.10.0.5** *(2015-02-14)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.5/builds/4chan-X-noupdate.crx "Chromium version")]
 - Fix thread cooldowns on /b/ and /pol/; apparently the 5-minute global cooldown after starting a thread only applies to boards other than the one you posted on.
 
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 70ad71f6c..b800f1f5c 100755
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -428,7 +428,7 @@ Header =
   scrollTo: (root, down, needed) ->
     if down
       x = Header.getBottomOf root
-      if Conf['Header auto-hide on scroll'] and Conf['Bottom header']
+      if Conf['Fixed Header'] and Conf['Header auto-hide on scroll'] and Conf['Bottom header']
         {height} = Header.bar.getBoundingClientRect()
         if x <= 0
           x += height if !Header.isHidden()
@@ -437,7 +437,7 @@ Header =
       window.scrollBy 0, -x unless needed and x >= 0
     else
       x = Header.getTopOf root
-      if Conf['Header auto-hide on scroll'] and !Conf['Bottom header']
+      if Conf['Fixed Header'] and Conf['Header auto-hide on scroll'] and !Conf['Bottom header']
         {height} = Header.bar.getBoundingClientRect()
         if x >= 0
           x += height if !Header.isHidden()
@@ -458,7 +458,7 @@ Header =
   getBottomOf: (root) ->
     {clientHeight} = doc
     bottom = clientHeight - root.getBoundingClientRect().bottom
-    if Conf['Bottom Header']
+    if Conf['Fixed Header'] and Conf['Bottom Header']
       headRect = Header.toggle.getBoundingClientRect()
       bottom  -= clientHeight - headRect.bottom + headRect.height
     bottom