Index: src/wp-admin/js/editor-expand.js
===================================================================
--- src/wp-admin/js/editor-expand.js	(revision 29679)
+++ src/wp-admin/js/editor-expand.js	(working copy)
@@ -223,14 +223,13 @@
 		}
 
 		function mceHide() {
-			var wrapHeight = $( '#wpwrap' ).height();
+			var top =  $contentWrap.offset().top;
 
-			textEditorResize();
-
-			if ( wrapHeight && $window.scrollTop() > wrapHeight ) {
-				window.scrollTo( window.pageXOffset, wrapHeight - 1 );
+			if ( $window.scrollTop() > top ) {
+				window.scrollTo( window.pageXOffset, $contentWrap.offset().top - heights.adminBarHeight );
 			}
 
+			textEditorResize();
 			adjust();
 		}