diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css
index 267f46749..1bd68c373 100644
--- a/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css
+++ b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css
@@ -1,11 +1,13 @@
 /*
 Distraction Free Writing mode TinyMCE Styles
 */
-
-html, body {
+
+html,
+body {
 	background: transparent;
 	width: auto !important;
 	max-width: none !important;
-	margin: 0;
-	padding: 0;
+	margin: 0 !important;
+	padding: 0 !important;
+	min-height: 0 !important;
 }
diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js
index 11871facb..9d33795f4 100644
--- a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js
+++ b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js
@@ -8,7 +8,7 @@
 	tinymce.create('tinymce.plugins.wpFullscreenPlugin', {
 
 		init : function(ed, url) {
-			var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM, resized = false;
+			var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM;
 
 			// Register commands
 			ed.addCommand('wpFullScreenClose', function() {
@@ -112,26 +112,22 @@
 			 * This method gets executed each time the editor needs to resize.
 			 */
 			function resize() {
-				if ( resized )
-					return;
-
 				var d = ed.getDoc(), DOM = tinymce.DOM, resizeHeight, myHeight;
 
 				// Get height differently depending on the browser used
-				if ( tinymce.isIE || tinymce.isWebKit )
-					myHeight = d.body.scrollHeight;
-				else
+				if ( tinymce.isWebKit )
 					myHeight = d.body.offsetHeight;
+				else
+					myHeight = d.body.scrollHeight;
 
 				// Don't make it smaller than 300px
 				resizeHeight = (myHeight > 300) ? myHeight : 300;
 
 				// Resize content element
 				if ( oldHeight != resizeHeight ) {
-					resized = true;
-					setTimeout(function(){ resized = false; }, 100);
 					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
 					oldHeight = resizeHeight;
+					ed.getWin().scrollTo(0,0);
 				}
 			};