diff --git a/src/android/support/design/widget/CollapsingToolbarLayout.java b/src/android/support/design/widget/CollapsingToolbarLayout.java
index b2b55f7e9..7c09925d8 100644
--- a/src/android/support/design/widget/CollapsingToolbarLayout.java
+++ b/src/android/support/design/widget/CollapsingToolbarLayout.java
@@ -312,6 +312,12 @@ public class CollapsingToolbarLayout extends FrameLayout {
         mRefreshToolbar = false;
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        ensureToolbar();
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
@@ -332,8 +338,6 @@ public class CollapsingToolbarLayout extends FrameLayout {
             getViewOffsetHelper(child).onViewLayout();
         }
 
-        ensureToolbar();
-
         // Update the collapsed bounds by getting it's transformed bounds
         if (mDummyView != null) {
             ViewGroupUtils.getDescendantRect(this, mDummyView, mTmpRect);