diff --git a/mozilla/widget/src/mac/nsMacEventHandler.cpp b/mozilla/widget/src/mac/nsMacEventHandler.cpp
index 9e42a20b02b..40125a64c19 100644
--- a/mozilla/widget/src/mac/nsMacEventHandler.cpp
+++ b/mozilla/widget/src/mac/nsMacEventHandler.cpp
@@ -1407,10 +1407,10 @@ PRBool nsMacEventHandler::ResizeEvent ( WindowRef inWindow )
 	::GetWindowPortBounds ( inWindow, &macRect );
 	::LocalToGlobal(&topLeft(macRect));
 	::LocalToGlobal(&botRight(macRect));
-	mTopLevelWidget->SetSizeMode(nsSizeMode_Normal); // size a zoomed window and it's no longer zoomed
 	mTopLevelWidget->Resize(macRect.right - macRect.left + 1, macRect.bottom - macRect.top + 1, PR_FALSE);
 	if (nsnull != gRollupListener && (nsnull != gRollupWidget) )
 		gRollupListener->Rollup();
+	mTopLevelWidget->UserStateForResize(); // size a zoomed window and it's no longer zoomed
 
 	return PR_TRUE;
 }
@@ -1599,15 +1599,6 @@ PRBool nsMacEventHandler::HandleMouseDownEvent(EventRecord&	aOSEvent)
 		{
 			gEventDispatchHandler.DispatchSizeModeEvent(mTopLevelWidget,
 				partCode == inZoomIn ? nsSizeMode_Normal : nsSizeMode_Maximized);
-
-			// Now that we have found the partcode it is ok to actually zoom the window
-			ZoomWindow(whichWindow, partCode, (whichWindow == FrontWindow()));
-			
-			Rect macRect;
-			::GetWindowPortBounds(whichWindow, &macRect);
-			::LocalToGlobal(&topLeft(macRect));
-			::LocalToGlobal(&botRight(macRect));
-			mTopLevelWidget->Resize(macRect.right - macRect.left, macRect.bottom - macRect.top, PR_FALSE);
 			break;
 		}