diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index c631dd5..e277f74 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -309,13 +309,14 @@
             public void run() {
                 if (!mIsTwoPanel) {
                     // We never want the height of the photo view to exceed its width.
-                    mMaximumHeaderHeight = getWidth();
+                    mMaximumHeaderHeight = mPhotoViewContainer.getWidth();
                     mIntermediateHeaderHeight = (int) (mMaximumHeaderHeight
                             * INTERMEDIATE_HEADER_HEIGHT_RATIO);
                 }
                 final boolean isLandscape = getResources().getConfiguration().orientation
                         == Configuration.ORIENTATION_LANDSCAPE;
-                mMaximumPortraitHeaderHeight = isLandscape ? getHeight() : getWidth();
+                mMaximumPortraitHeaderHeight = isLandscape ? getHeight()
+                        : mPhotoViewContainer.getWidth();
                 setHeaderHeight(getMaximumScrollableHeaderHeight());
                 mMaximumHeaderTextSize = mLargeTextView.getHeight();
                 if (mIsTwoPanel) {