diff --git a/src/js/_enqueues/admin/postbox.js b/src/js/_enqueues/admin/postbox.js
index 9789518b65..09979217d4 100644
--- a/src/js/_enqueues/admin/postbox.js
+++ b/src/js/_enqueues/admin/postbox.js
@@ -341,7 +341,7 @@
 		_mark_area : function() {
 			var visible = $('div.postbox:visible').length, side = $('#post-body #side-sortables');
 
-			$( '#dashboard-widgets .meta-box-sortables:visible' ).each( function() {
+			$( '.meta-box-sortables:visible' ).each( function() {
 				var t = $(this);
 
 				if ( visible == 1 || t.children('.postbox:visible').length ) {
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index a8b8112b00..9f6bf15dac 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2005,7 +2005,7 @@ html.wp-toolbar {
 	text-align: center;
 	color: #ccc;
 	font-size: 18px;
-	display: none;
+	display: block;
 }
 
 .metabox-holder.columns-1 .postbox-container .empty-container,
@@ -2040,6 +2040,10 @@ html.wp-toolbar {
 		height: 0;
 		min-height: 0;
 	}
+
+	.metabox-holder .postbox-container .empty-container:after {
+		display: none;
+	}
 }
 
 .js .widget .widget-top,
diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
index eac01008e8..1cf884b815 100644
--- a/src/wp-admin/css/dashboard.css
+++ b/src/wp-admin/css/dashboard.css
@@ -1151,10 +1151,6 @@ a.rsswidget {
 	.columns-prefs .columns-prefs-4 {
 		display: none;
 	}
-
-	.metabox-holder .postbox-container .empty-container:after {
-		display: block;
-	}
 }
 
 /* three columns on the dash */
@@ -1181,10 +1177,6 @@ a.rsswidget {
 	#dashboard-widgets #postbox-container-4 .empty-container:after {
 		display: none;
 	}
-
-	.metabox-holder .postbox-container .empty-container:after {
-		display: block;
-	}
 }
 
 @media screen and (max-width: 870px) {
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 20d4c4d27a..14b19aa8c2 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -151,6 +151,10 @@ body.post-new-php .submitbox .submitdelete {
 	min-height: 50px;
 }
 
+#post-body #normal-sortables.empty-container {
+	margin-bottom: 20px;
+}
+
 .postbox {
 	position: relative;
 	min-width: 255px;
@@ -159,6 +163,10 @@ body.post-new-php .submitbox .submitdelete {
 	background: #fff;
 }
 
+#poststuff .metabox-holder .postbox-container .empty-container {
+	height: 50px;
+}
+
 #trackback_url {
 	width: 99%;
 }