diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js
index b488632f3..51a75bdaa 100644
--- a/admin/javascript/LeftAndMain.js
+++ b/admin/javascript/LeftAndMain.js
@@ -95,7 +95,7 @@ jQuery.noConflict();
 			redraw: function() {
 				// Move from inner to outer layouts. Some of the elements might not exist.
 				// Not all edit forms are layouted, so qualify by their data value.
-				
+				this.find('.cms-content-fields[data-layout-type]').redraw(); 
 				this.find('.cms-edit-form[data-layout-type]').redraw(); 
 				
 				// Only redraw preview if its visible
@@ -250,6 +250,12 @@ jQuery.noConflict();
 			}
 		});
 
+		$('.cms-content-fields').entwine({
+			redraw: function() {
+				this.layout();
+			}
+		});
+
 		/**
 		 * Make all buttons "hoverable" with jQuery theming.
 		 * Also sets the clicked button on a form submission, making it available through