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,15 +223,16 @@
 		}
 
 		function mceHide() {
-			var wrapHeight = $( '#wpwrap' ).height();
+			window.setTimeout( function() {
+				var top =  $contentWrap.offset().top;
 
-			textEditorResize();
-
-			if ( wrapHeight && $window.scrollTop() > wrapHeight ) {
-				window.scrollTo( window.pageXOffset, wrapHeight - 1 );
-			}
+				if ( window.pageYOffset > top ) {
+					window.scrollTo( window.pageXOffset, top - heights.adminBarHeight );
+				}
 
-			adjust();
+				textEditorResize();
+				adjust();
+			}, 200 );
 		}
 
 		mceBind = function() {