Index: Gruntfile.js
===================================================================
--- Gruntfile.js	(revision 29049)
+++ Gruntfile.js	(working copy)
@@ -230,6 +230,7 @@
 					'wp-includes/js/plupload/wp-plupload.js',
 					'wp-includes/js/tinymce/plugins/wordpress/plugin.js',
 					'wp-includes/js/tinymce/plugins/wp*/plugin.js',
+					'!wp-includes/js/tinymce/plugins/wpautoresize/plugin.js',
 					// Third party scripts
 					'!wp-admin/js/farbtastic.js',
 					'!wp-includes/js/backbone*.js',
Index: src/wp-admin/js/editor-expand.js
===================================================================
--- src/wp-admin/js/editor-expand.js	(revision 29049)
+++ src/wp-admin/js/editor-expand.js	(working copy)
@@ -1,3 +1,4 @@
+/* global tinymce */
 
 window.wp = window.wp || {};
 
@@ -15,7 +16,6 @@
 		$bottom = $( '#post-status-info' ),
 		$statusBar,
 		buffer = 200,
-		adjust,
 		fullscreen = window.wp.editor && window.wp.editor.fullscreen,
 		editorInstance,
 		fixedTop = false,
@@ -285,7 +285,7 @@
 			$top.css( {
 				position: 'fixed',
 				top: adminBarHeight + toolsHeight,
-				width: editorWidth - ( visual ? 0 : 38 ),
+				width: $editor.parent().width() - ( $top.outerWidth() - $top.width() ),
 				borderTop: '1px solid #e5e5e5'
 			} );
 
@@ -329,7 +329,7 @@
 					borderTop: 'none',
 					width: $contentWrap.width()
 				} );
-			}				
+			}
 		}
 
 		// Maybe adjust the bottom bar.