.../js/tinymce/plugins/wordpress/editor_plugin_src.js       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
index 9fecbc4..ae95cbe 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
@@ -217,12 +217,13 @@
 			});
 
 			ed.onSaveContent.add(function(ed, o) {
-				if ( ed.getParam('wpautop', true) && typeof(switchEditors) == 'object' ) {
-					if ( ed.isHidden() )
-						o.content = o.element.value;
-					else
-						o.content = switchEditors.pre_wpautop(o.content);
-				}
+				// If editor is hidden, we just want the textarea's value to be saved, not the TinyMCE's content.
+				if ( ed.isHidden() )
+					o.content = o.element.value;
+				// If editor is not hidden, and 'wpautop' == true, we want to unautop the TinyMCE's content.
+				else if ( ed.getParam('wpautop', true) && typeof(switchEditors) == 'object' )
+					o.content = switchEditors.pre_wpautop(o.content);
+				// Otherwise leave it alone...
 			});
 
 			/* disable for now