diff --git a/view/src/nsScrollingView.cpp b/view/src/nsScrollingView.cpp
index 0465e3cea084..6e7c99233321 100644
--- a/view/src/nsScrollingView.cpp
+++ b/view/src/nsScrollingView.cpp
@@ -417,41 +417,11 @@ NS_IMETHODIMP nsScrollingView :: SetDimensions(nscoord width, nscoord height, PR
   clipRect.SetRect(0, 0, width - showVert, height - showHorz);
   clipRect.Deflate(mInsets);
 
-  // Position the corner view
-  if (nsnull != mCornerView)
-  {
-    nsSize  cornerSize;
-
-    mCornerView->GetDimensions(&cornerSize.width, &cornerSize.height);
-    mCornerView->SetBounds(clipRect.XMost(), clipRect.YMost(), cornerSize.width,
-                           cornerSize.height, aPaint);
-  }
-
   // Size and position the clip view
   if (nsnull != mClipView)
-  {
     mClipView->SetBounds(clipRect, aPaint);
-  }
 
-  // Size and position the vertical scrollbar
-  if (nsnull != mVScrollBarView)
-  {
-    nsSize  sbSize;
-
-    mVScrollBarView->GetDimensions(&sbSize.width, &sbSize.height);
-    mVScrollBarView->SetBounds(clipRect.XMost(), clipRect.y, sbSize.width, 
-                               clipRect.height, aPaint);
-  }
-
-  // Size and position the horizontal scrollbar
-  if (nsnull != mHScrollBarView)
-  {
-    nsSize  sbSize;
-    
-    mHScrollBarView->GetDimensions(&sbSize.width, &sbSize.height);
-    mHScrollBarView->SetBounds(clipRect.x, clipRect.YMost(), clipRect.width,
-                               sbSize.height, aPaint);
-  }
+  UpdateScrollControls(aPaint);
 
   //this will fix the size of the thumb when we resize the root window,
   //but unfortunately it will also cause scrollbar flashing. so long as
@@ -1144,6 +1114,7 @@ NS_IMETHODIMP nsScrollingView :: ComputeContainerSize()
     {
       controlRect.width -= vwidth;
     }
+
     mClipView->SetDimensions(controlRect.width, controlRect.height, PR_FALSE);
 
     // Position the scrolled view
@@ -1202,6 +1173,9 @@ NS_IMETHODIMP nsScrollingView :: ComputeContainerSize()
     mOffsetX = mOffsetY = 0;
     mSizeX = mSizeY = 0;
   }
+
+  UpdateScrollControls(PR_TRUE);
+
   return NS_OK;
 }
 
@@ -1394,6 +1368,46 @@ void nsScrollingView :: AdjustChildWidgets(nsScrollingView *aScrolling, nsIView
   }
 }
 
+void nsScrollingView :: UpdateScrollControls(PRBool aPaint)
+{
+  nsRect  clipRect;
+
+  if (nsnull != mClipView)
+  {
+    mClipView->GetBounds(clipRect);
+
+    // Position the corner view
+    if (nsnull != mCornerView)
+    {
+      nsSize  cornerSize;
+
+      mCornerView->GetDimensions(&cornerSize.width, &cornerSize.height);
+      mCornerView->SetBounds(clipRect.XMost(), clipRect.YMost(), cornerSize.width,
+                             cornerSize.height, aPaint);
+    }
+
+    // Size and position the vertical scrollbar
+    if (nsnull != mVScrollBarView)
+    {
+      nsSize  sbSize;
+
+      mVScrollBarView->GetDimensions(&sbSize.width, &sbSize.height);
+      mVScrollBarView->SetBounds(clipRect.XMost(), clipRect.y, sbSize.width, 
+                                 clipRect.height, aPaint);
+    }
+
+    // Size and position the horizontal scrollbar
+    if (nsnull != mHScrollBarView)
+    {
+      nsSize  sbSize;
+    
+      mHScrollBarView->GetDimensions(&sbSize.width, &sbSize.height);
+      mHScrollBarView->SetBounds(clipRect.x, clipRect.YMost(), clipRect.width,
+                                 sbSize.height, aPaint);
+    }
+  }
+}
+
 NS_IMETHODIMP nsScrollingView :: SetScrolledView(nsIView *aScrolledView)
 {
   return mViewManager->InsertChild(mClipView, aScrolledView, 0);
diff --git a/view/src/nsScrollingView.h b/view/src/nsScrollingView.h
index 9c71aa1a8700..6c99722a9b13 100644
--- a/view/src/nsScrollingView.h
+++ b/view/src/nsScrollingView.h
@@ -64,6 +64,7 @@ public:
   //private
   virtual void HandleScrollEvent(nsGUIEvent *aEvent, PRUint32 aEventFlags);
   virtual void AdjustChildWidgets(nsScrollingView *aScrolling, nsIView *aView, nscoord aDx, nscoord aDy, float aScale);
+  virtual void UpdateScrollControls(PRBool aPaint);
 
 private:
   NS_IMETHOD_(nsrefcnt) AddRef(void);