diff --git a/library/src/za/co/immedia/pinnedheaderlistview/PinnedHeaderListView.java b/library/src/za/co/immedia/pinnedheaderlistview/PinnedHeaderListView.java
index 5af9e2f..f6a94a2 100644
--- a/library/src/za/co/immedia/pinnedheaderlistview/PinnedHeaderListView.java
+++ b/library/src/za/co/immedia/pinnedheaderlistview/PinnedHeaderListView.java
@@ -88,14 +88,14 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
 
         mHeaderOffset = 0.0f;
 
+        final float pinnedHeaderHeight = mCurrentHeader.getMeasuredHeight();
         for (int i = firstVisibleItem; i < firstVisibleItem + visibleItemCount; i++) {
             if (mAdapter.isSectionHeader(i)) {
                 View header = getChildAt(i - firstVisibleItem);
                 float headerTop = header.getTop();
-                float pinnedHeaderHeight = mCurrentHeader.getMeasuredHeight();
                 header.setVisibility(VISIBLE);
                 if (pinnedHeaderHeight >= headerTop && headerTop > 0) {
-                    mHeaderOffset = headerTop - header.getHeight();
+                    mHeaderOffset = headerTop - pinnedHeaderHeight;
                 } else if (headerTop <= 0) {
                     header.setVisibility(INVISIBLE);
                 }