diff --git a/dist/butr.common.js b/dist/butr.common.js
index 1738c93..a3edc7b 100644
--- a/dist/butr.common.js
+++ b/dist/butr.common.js
@@ -835,7 +835,9 @@ var stickyNav = exports.stickyNav = function stickyNav(options) {
    * Set or remove classes to stick nav based on scroll position
    */
   var determineStickiness = function determineStickiness() {
-    if ((!settings.mediaQuery || matchMedia(settings.mediaQuery).matches) && scrollingElement.scrollTop >= pos) {
+    if (!settings.mediaQuery && scrollingElement.scrollTop >= pos) {
+      isSticky = true;
+    } else if (matchMedia(settings.mediaQuery).matches && scrollingElement.scrollTop >= pos) {
       isSticky = true;
     } else {
       isSticky = false;
@@ -847,8 +849,6 @@ var stickyNav = exports.stickyNav = function stickyNav(options) {
       nav.style.position = 'relative';
       nav.style.top = 'auto';
     }
-    // Recalculate width
-    setWidth();
   };
 
   /**
@@ -857,8 +857,10 @@ var stickyNav = exports.stickyNav = function stickyNav(options) {
   var init = function init() {
     determineYPos();
     determineStickiness();
+    setWidth();
     window.addEventListener('scroll', determineStickiness);
     window.addEventListener('resize', determineStickiness);
+    window.addEventListener('resize', setWidth);
   };
 
   init();
diff --git a/dist/butr.min.js b/dist/butr.min.js
index 12a9c1a..e73a41a 100644
--- a/dist/butr.min.js
+++ b/dist/butr.min.js
@@ -1,4 +1,4 @@
-window.butr=function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.stickyNav=t.to=t.marker=t.autoSidebar=t.autoAnchors=void 0;var r=n(1),o=function(e){return e&&e.__esModule?e:{default:e}}(r),i=!1,u=function(e,t){var n=void 0;return function(){var r=this,o=arguments;clearTimeout(n),n=setTimeout(function(){e.apply(r,o)},t)}},a=function(e,t){var n=e.className+" "+t;e.className=n.trim()},c=function(e){var t={duration:800,loop:null,done:null,easing:"easeInOutQuad"},n=(0,o.default)({},t,e),r=void 0,u=void 0,a=void 0,c=function e(){a=performance.now(),n.loop(l),a<u?requestAnimationFrame(e):(i=!1,"function"==typeof n.done&&n.done())},l=function(e,t){return e+(t-e)*d[n.easing](s())},s=function(){return Math.min((a-r)/n.duration,1)},d={linear:function(e){return e},easeInQuad:function(e){return e*e},easeOutQuad:function(e){return e*(2-e)},easeInOutQuad:function(e){return e<.5?2*e*e:(4-2*e)*e-1},easeInCubic:function(e){return e*e*e},easeOutCubic:function(e){return--e*e*e+1},easeInOutCubic:function(e){return e<.5?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1},easeInQuart:function(e){return e*e*e*e},easeOutQuart:function(e){return 1- --e*e*e*e},easeInOutQuart:function(e){return e<.5?8*e*e*e*e:1-8*--e*e*e*e},easeInQuint:function(e){return e*e*e*e*e},easeOutQuint:function(e){return 1+--e*e*e*e*e},easeInOutQuint:function(e){return e<.5?16*e*e*e*e*e:1+16*--e*e*e*e*e}};!function(){i=!0,r=performance.now(),u=r+n.duration,c()}()},l=t.autoAnchors=function(e){var t={to:{}},n=(0,o.default)({},t,e),r=document.body.querySelectorAll("a[data-butr]");if(!r.length)return!1;for(var i=0;i<r.length;i++)r[i].addEventListener("click",function(e){e.preventDefault(),f((0,o.default)(n.to,{target:e.currentTarget.getAttribute("href")}))})},s=t.autoSidebar=function(e){var t={olClass:"",liClass:"",aClass:"",prepend:!1},n=(0,o.default)({},t,e),r=void 0,i=void 0,u=void 0,c=void 0,l=[],s=[l],d=0,f=function(e){for(var t=e.toLowerCase().replace(/\s+/g,"-").replace(/(\d)\./g,"$1-").replace(/[^\w\-]+/g,"").replace(/\-\-+/g,"-").replace(/^-+/,"").replace(/-+$/,""),n=t,r=0;document.getElementById(n);)n=t+"-"+ ++r;return n},p=function(e){return e.id||(e.id=f(e.textContent)),"#"+e.id},m=function(){u=document.querySelector(".js-butr-nav"),r=document.querySelector(".js-butr-content"),i=r.querySelectorAll("h2, h3, h4, h5, h6")},v=function(){return!!(u&&r&&i)||(console.error("Error: Missing required classes on nav, content, or headings. Aborted setup of Butr.marker"),!1)},h=function(e){return parseInt(e.tagName.substr(1))-d},b=function(e){return i[e+1]?parseInt(i[e+1].tagName.substr(1))-d:0},g=function(e){return{label:e.textContent,hash:p(e),children:[]}},y=function(){for(var e=0;e<i.length;e++){var t=i[e],n=h(t),r=b(e),o=g(t);if(c=s[s.length-1],c.push(o),r)if(r>n)d+=r-n-1,r-=d,s.push(o.children);else if(r<n){r+=d;for(var u=0;u<n-r;u++)s.pop();d=0}}},j=function(e){var t=document.createElement("li"),r=document.createElement("a");return r.href=e.hash,r.setAttribute("data-butr",!0),r.innerText=e.label,r.classList.add("js-butr-link"),n.aClass&&a(r,n.aClass),n.liClass&&a(t,n.liClass),t.appendChild(r),t},C=function e(t){var r=document.createElement("ol");n.olClass&&a(r,n.olClass);for(var o=0;o<t.length;o++){var i=t[o],u=j(i);i.children.length&&u.appendChild(e(i.children)),r.appendChild(u)}return r};!function(){if(m(),v()){y();var e=C(l);n.prepend?u.insertBefore(e,u.firstElementChild):u.appendChild(e)}}()},d=t.marker=function(e){var t={scrollingElement:!1,duration:400,callback:!1,markerClass:"",activeClass:""},n=(0,o.default)({},t,e),r=window.matchMedia("(prefers-reduced-motion)").matches,c=void 0,l=void 0,s=void 0,d=void 0,f=void 0,p=void 0,m=void 0,v=function(){s=n.scrollingElement?document.querySelector(n.scrollingElement):document.scrollingElement||document.documentElement,m=document.querySelector(".js-butr-nav"),d=document.querySelectorAll(".js-butr-link"),f=document.querySelector(".js-butr-content"),p=f.querySelectorAll("h2, h3, h4, h5, h6")},h=function(){return!!(m&&d&&f)||(console.error("Error: Missing required classes on nav or links. Aborted setup of Butr.marker"),!1)},b=function(){l=document.createElement("div"),l.classList.add("js-butr-marker"),n.markerClass&&a(l,n.markerClass),l.style.height=d[0].offsetHeight+"px",r||(l.style.transition=n.duration+"ms transform cubic-bezier(0.455, 0.03, 0.515, 0.955)"),m.appendChild(l)},g=function(e){l.style.transform="translateY("+e.offsetTop+"px)"},y=function(){for(var e=0;e<d.length;e++)!function(e){d[e].addEventListener("click",function(t){C(d[e].hash)})}(e)},j=function(){for(var e=void 0,t=0;t<p.length;t++){if(p[t].offsetTop>c){e||(e=p[t]);break}e=p[t]}e&&C("#"+e.id)},C=function(e){var t=document.querySelector(".js-butr-link.js-butr-active"),r=document.querySelector('.js-butr-link[href="'+e+'"]');r!==t&&(t&&(t.classList.remove("js-butr-active"),n.activeClass&&t.classList.remove(n.activeClass)),r&&(r.classList.add("js-butr-active"),n.activeClass&&a(r,n.activeClass),g(r)))},k=function(){c=s.scrollTop,j()},E=u(function(){i||k()},50);!function(){v(),h()&&(b(),y(),k(),window.addEventListener("scroll",E))}()},f=t.to=function(e){var t={scrollingElement:!1,target:0,direction:"y",speed:1,keepHash:!0,callback:null},n=(0,o.default)({},t,e),r=window.matchMedia("(prefers-reduced-motion)").matches,i=void 0,u=void 0,a=void 0,l=function(){return e.scrollingElement?document.querySelector(e.scrollingElement):document.scrollingElement||document.documentElement},s=function(){return"x"===n.direction?a.scrollLeft:"y"===n.direction?a.scrollTop:void 0},d=function(){if("#"===n.target[0]){var e=document.getElementById(n.target.substr(1));return e&&"x"===n.direction?e.offsetLeft:e&&"y"===n.direction?e.offsetTop:0}return n.target},f=function(e){"x"===n.direction&&(a.scrollLeft=e),"y"===n.direction&&(a.scrollTop=e)},p=function(){"function"==typeof n.callback&&n.callback()},m=function(e){return 1/n.speed*24*Math.sqrt(Math.abs(e))},v=function(){i=s(),(u=d())!==i&&c({duration:m(u-i),loop:function(e){var t=e(i,u);f(t)},done:p})},h=function(){n.keepHash&&"#"===n.target[0]&&history.pushState({},"",n.target)};!function(){a=l(),r?f(d()):v(),h()}()},p=t.stickyNav=function(e){var t={distanceTop:0,mediaQuery:!1},n=(0,o.default)({},t,e),r=0,i=document.scrollingElement||document.documentElement,a=document.querySelector(".js-butr-nav"),c=!1,l=function(){r=a.offsetTop-s(n.distanceTop)},s=function(e){return"number"==typeof e?e:parseInt(e.replace(/[^0-9\.]+/g,""))},d=u(function(){if(c){var e=window.getComputedStyle(a.parentNode,null),t=s(e.getPropertyValue("padding-right")),n=s(e.getPropertyValue("padding-left")),r=s(e.getPropertyValue("width"));a.style.maxWidth=r-n-t+"px"}else a.style.maxWidth=null},250),f=function(){c=!(n.mediaQuery&&!matchMedia(n.mediaQuery).matches||!(i.scrollTop>=r)),c?(a.style.position="fixed",a.style.top=s(n.distanceTop)+"px"):(a.style.position="relative",a.style.top="auto"),d()};!function(){l(),f(),window.addEventListener("scroll",f),window.addEventListener("resize",f)}()};t.default={autoAnchors:l,autoSidebar:s,marker:d,stickyNav:p,to:f}},function(e,t,n){"use strict";function r(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}/*
+window.butr=function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.stickyNav=t.to=t.marker=t.autoSidebar=t.autoAnchors=void 0;var r=n(1),o=function(e){return e&&e.__esModule?e:{default:e}}(r),i=!1,u=function(e,t){var n=void 0;return function(){var r=this,o=arguments;clearTimeout(n),n=setTimeout(function(){e.apply(r,o)},t)}},a=function(e,t){var n=e.className+" "+t;e.className=n.trim()},c=function(e){var t={duration:800,loop:null,done:null,easing:"easeInOutQuad"},n=(0,o.default)({},t,e),r=void 0,u=void 0,a=void 0,c=function e(){a=performance.now(),n.loop(l),a<u?requestAnimationFrame(e):(i=!1,"function"==typeof n.done&&n.done())},l=function(e,t){return e+(t-e)*d[n.easing](s())},s=function(){return Math.min((a-r)/n.duration,1)},d={linear:function(e){return e},easeInQuad:function(e){return e*e},easeOutQuad:function(e){return e*(2-e)},easeInOutQuad:function(e){return e<.5?2*e*e:(4-2*e)*e-1},easeInCubic:function(e){return e*e*e},easeOutCubic:function(e){return--e*e*e+1},easeInOutCubic:function(e){return e<.5?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1},easeInQuart:function(e){return e*e*e*e},easeOutQuart:function(e){return 1- --e*e*e*e},easeInOutQuart:function(e){return e<.5?8*e*e*e*e:1-8*--e*e*e*e},easeInQuint:function(e){return e*e*e*e*e},easeOutQuint:function(e){return 1+--e*e*e*e*e},easeInOutQuint:function(e){return e<.5?16*e*e*e*e*e:1+16*--e*e*e*e*e}};!function(){i=!0,r=performance.now(),u=r+n.duration,c()}()},l=t.autoAnchors=function(e){var t={to:{}},n=(0,o.default)({},t,e),r=document.body.querySelectorAll("a[data-butr]");if(!r.length)return!1;for(var i=0;i<r.length;i++)r[i].addEventListener("click",function(e){e.preventDefault(),f((0,o.default)(n.to,{target:e.currentTarget.getAttribute("href")}))})},s=t.autoSidebar=function(e){var t={olClass:"",liClass:"",aClass:"",prepend:!1},n=(0,o.default)({},t,e),r=void 0,i=void 0,u=void 0,c=void 0,l=[],s=[l],d=0,f=function(e){for(var t=e.toLowerCase().replace(/\s+/g,"-").replace(/(\d)\./g,"$1-").replace(/[^\w\-]+/g,"").replace(/\-\-+/g,"-").replace(/^-+/,"").replace(/-+$/,""),n=t,r=0;document.getElementById(n);)n=t+"-"+ ++r;return n},p=function(e){return e.id||(e.id=f(e.textContent)),"#"+e.id},m=function(){u=document.querySelector(".js-butr-nav"),r=document.querySelector(".js-butr-content"),i=r.querySelectorAll("h2, h3, h4, h5, h6")},v=function(){return!!(u&&r&&i)||(console.error("Error: Missing required classes on nav, content, or headings. Aborted setup of Butr.marker"),!1)},h=function(e){return parseInt(e.tagName.substr(1))-d},b=function(e){return i[e+1]?parseInt(i[e+1].tagName.substr(1))-d:0},g=function(e){return{label:e.textContent,hash:p(e),children:[]}},y=function(){for(var e=0;e<i.length;e++){var t=i[e],n=h(t),r=b(e),o=g(t);if(c=s[s.length-1],c.push(o),r)if(r>n)d+=r-n-1,r-=d,s.push(o.children);else if(r<n){r+=d;for(var u=0;u<n-r;u++)s.pop();d=0}}},j=function(e){var t=document.createElement("li"),r=document.createElement("a");return r.href=e.hash,r.setAttribute("data-butr",!0),r.innerText=e.label,r.classList.add("js-butr-link"),n.aClass&&a(r,n.aClass),n.liClass&&a(t,n.liClass),t.appendChild(r),t},C=function e(t){var r=document.createElement("ol");n.olClass&&a(r,n.olClass);for(var o=0;o<t.length;o++){var i=t[o],u=j(i);i.children.length&&u.appendChild(e(i.children)),r.appendChild(u)}return r};!function(){if(m(),v()){y();var e=C(l);n.prepend?u.insertBefore(e,u.firstElementChild):u.appendChild(e)}}()},d=t.marker=function(e){var t={scrollingElement:!1,duration:400,callback:!1,markerClass:"",activeClass:""},n=(0,o.default)({},t,e),r=window.matchMedia("(prefers-reduced-motion)").matches,c=void 0,l=void 0,s=void 0,d=void 0,f=void 0,p=void 0,m=void 0,v=function(){s=n.scrollingElement?document.querySelector(n.scrollingElement):document.scrollingElement||document.documentElement,m=document.querySelector(".js-butr-nav"),d=document.querySelectorAll(".js-butr-link"),f=document.querySelector(".js-butr-content"),p=f.querySelectorAll("h2, h3, h4, h5, h6")},h=function(){return!!(m&&d&&f)||(console.error("Error: Missing required classes on nav or links. Aborted setup of Butr.marker"),!1)},b=function(){l=document.createElement("div"),l.classList.add("js-butr-marker"),n.markerClass&&a(l,n.markerClass),l.style.height=d[0].offsetHeight+"px",r||(l.style.transition=n.duration+"ms transform cubic-bezier(0.455, 0.03, 0.515, 0.955)"),m.appendChild(l)},g=function(e){l.style.transform="translateY("+e.offsetTop+"px)"},y=function(){for(var e=0;e<d.length;e++)!function(e){d[e].addEventListener("click",function(t){C(d[e].hash)})}(e)},j=function(){for(var e=void 0,t=0;t<p.length;t++){if(p[t].offsetTop>c){e||(e=p[t]);break}e=p[t]}e&&C("#"+e.id)},C=function(e){var t=document.querySelector(".js-butr-link.js-butr-active"),r=document.querySelector('.js-butr-link[href="'+e+'"]');r!==t&&(t&&(t.classList.remove("js-butr-active"),n.activeClass&&t.classList.remove(n.activeClass)),r&&(r.classList.add("js-butr-active"),n.activeClass&&a(r,n.activeClass),g(r)))},w=function(){c=s.scrollTop,j()},E=u(function(){i||w()},50);!function(){v(),h()&&(b(),y(),w(),window.addEventListener("scroll",E))}()},f=t.to=function(e){var t={scrollingElement:!1,target:0,direction:"y",speed:1,keepHash:!0,callback:null},n=(0,o.default)({},t,e),r=window.matchMedia("(prefers-reduced-motion)").matches,i=void 0,u=void 0,a=void 0,l=function(){return e.scrollingElement?document.querySelector(e.scrollingElement):document.scrollingElement||document.documentElement},s=function(){return"x"===n.direction?a.scrollLeft:"y"===n.direction?a.scrollTop:void 0},d=function(){if("#"===n.target[0]){var e=document.getElementById(n.target.substr(1));return e&&"x"===n.direction?e.offsetLeft:e&&"y"===n.direction?e.offsetTop:0}return n.target},f=function(e){"x"===n.direction&&(a.scrollLeft=e),"y"===n.direction&&(a.scrollTop=e)},p=function(){"function"==typeof n.callback&&n.callback()},m=function(e){return 1/n.speed*24*Math.sqrt(Math.abs(e))},v=function(){i=s(),(u=d())!==i&&c({duration:m(u-i),loop:function(e){var t=e(i,u);f(t)},done:p})},h=function(){n.keepHash&&"#"===n.target[0]&&history.pushState({},"",n.target)};!function(){a=l(),r?f(d()):v(),h()}()},p=t.stickyNav=function(e){var t={distanceTop:0,mediaQuery:!1},n=(0,o.default)({},t,e),r=0,i=document.scrollingElement||document.documentElement,a=document.querySelector(".js-butr-nav"),c=!1,l=function(){r=a.offsetTop-s(n.distanceTop)},s=function(e){return"number"==typeof e?e:parseInt(e.replace(/[^0-9\.]+/g,""))},d=u(function(){if(c){var e=window.getComputedStyle(a.parentNode,null),t=s(e.getPropertyValue("padding-right")),n=s(e.getPropertyValue("padding-left")),r=s(e.getPropertyValue("width"));a.style.maxWidth=r-n-t+"px"}else a.style.maxWidth=null},250),f=function(){c=!n.mediaQuery&&i.scrollTop>=r||!!(matchMedia(n.mediaQuery).matches&&i.scrollTop>=r),c?(a.style.position="fixed",a.style.top=s(n.distanceTop)+"px"):(a.style.position="relative",a.style.top="auto")};!function(){l(),f(),d(),window.addEventListener("scroll",f),window.addEventListener("resize",f),window.addEventListener("resize",d)}()};t.default={autoAnchors:l,autoSidebar:s,marker:d,stickyNav:p,to:f}},function(e,t,n){"use strict";function r(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}/*
 object-assign
 (c) Sindre Sorhus
 @license MIT