diff --git a/sticky-header.js b/sticky-header.js
index 60ed038..a2b76be 100644
--- a/sticky-header.js
+++ b/sticky-header.js
@@ -35,21 +35,12 @@ var jQuery = require('jquery');
 
         if (isSticky) {
             stickyTimer = setTimeout(function () {
-                $element.addClass("is-sticky");                
-                
-                if (scrollbarVerticalPosition <= stickyElementHeight) {
-                    $body.addClass('sticky-top');
-                    $element.removeClass("sticky-wrapper");
-                    $body.css('padding-top', 0);
-                } else {
-                    $body.removeClass('sticky-top');
-                    $element.addClass("sticky-wrapper");
-                    $body.css('padding-top', stickyElementHeight);
-                }                
+                $element.addClass("is-sticky");
+                $body.css('padding-top', stickyElementHeight);
             }, stickyTimeout);
         } else {
             stickyTimer = setTimeout(function () {
-                $body.css('padding-top', 0);
+                $body.css('padding-top', stickyElementHeight);
                 $element.removeClass("is-sticky");
             }, stickyTimeout);
         }
@@ -99,6 +90,15 @@ var jQuery = require('jquery');
                     || stickyType == 'scroll-top' && scrollbarVerticalPosition > scrollbarPreviousVerticalPosition) {
                     // Scrolled to top or Scrolling down
                     makeSticky($stickyElement, $body, false);
+
+                    if (scrollbarVerticalPosition <= stickyElementHeight) {
+                        $body.addClass('sticky-top');
+                        $body.css('padding-top', 0);
+                        $stickyElement.removeClass("sticky-wrapper");
+                    } else {
+                        $body.removeClass('sticky-top');
+                        $stickyElement.addClass("sticky-wrapper");                        
+                    }
                 } else {
                     // Scrolling up
                     makeSticky($stickyElement, $body, true);