diff --git a/paper-scroll-header-panel.html b/paper-scroll-header-panel.html
index a1c2edf..af41b82 100644
--- a/paper-scroll-header-panel.html
+++ b/paper-scroll-header-panel.html
@@ -480,12 +480,8 @@
     },
 
     _condensesChanged: function() {
-      if (this.condenses) {
-        this._scroll();
-      } else {
-        // reset transform/opacity set on the header
-        this._condenseHeader(null);
-      }
+      this._updateScrollState(this.scroller.scrollTop);
+      this._condenseHeader(null);
     },
 
     _setup: function() {
@@ -558,14 +554,12 @@
       if (this.header) {
         this._updateScrollState(this.scroller.scrollTop);
 
-        if (event) {
-          this.fire('content-scroll', {
-            target: this.scroller
-          },
-          {
-            cancelable: false
-          });
-        }
+        this.fire('content-scroll', {
+          target: this.scroller
+        },
+        {
+          cancelable: false
+        });
       }
     },
 
@@ -588,7 +582,7 @@
         this._setHeaderState(this.HEADER_STATE_INTERPOLATED);
       }
 
-      if (!event || !this.fixed && y !== this._y) {
+      if (!this.fixed && y !== this._y) {
         this._transformHeader(y);
       }