diff --git a/assets/stylesheets/shared/functions/_z-index.scss b/assets/stylesheets/shared/functions/_z-index.scss
index 4dba0602f02a3e..88b04e3e8b5f1a 100644
--- a/assets/stylesheets/shared/functions/_z-index.scss
+++ b/assets/stylesheets/shared/functions/_z-index.scss
@@ -75,7 +75,7 @@ $z-layers: (
 		'.domain-suggestion.is-clickable:hover': 1,
 		'.editor-html-toolbar': 1,
 		'.thank-you-card__header': 1,
-		'.editor-action-bar__saved-status': 2,
+		'.editor-action-bar .editor-status-label': 2,
 		'.is-installing .theme': 2,
 		'.reader-update-notice': 2,
 		'.people-list-item .card__link-indicator': 2,
diff --git a/client/post-editor/editor-action-bar/index.jsx b/client/post-editor/editor-action-bar/index.jsx
index d59d4daff8a125..66c8a298a7cfcb 100644
--- a/client/post-editor/editor-action-bar/index.jsx
+++ b/client/post-editor/editor-action-bar/index.jsx
@@ -41,7 +41,6 @@ export default React.createClass( {
 			<div className="editor-action-bar">
 				<div className="editor-action-bar__cell is-left">
 					<EditorStatusLabel
-						className="editor-action-bar__saved-status"
 						post={ this.props.savedPost }
 						advancedStatus
 						type={ this.props.type }
diff --git a/client/post-editor/editor-action-bar/style.scss b/client/post-editor/editor-action-bar/style.scss
index d192d3e7663af0..04aa3d24909796 100644
--- a/client/post-editor/editor-action-bar/style.scss
+++ b/client/post-editor/editor-action-bar/style.scss
@@ -9,32 +9,32 @@
 	@include breakpoint( "<660px" ) {
 		margin-bottom: 8px;
 	}
-}
 
-.editor-status-label.editor-action-bar__saved-status {
-	line-height: 1;
-	position: fixed;
-		bottom: 0px;
-		left: 8px;
-	padding: 8px;
-	margin-right: 2px;
-	background-color: rgba( $white, 0.92 );
-	text-transform: uppercase;
-	font-size: 11px;
-	line-height: 1;
-	color: lighten( $gray, 10% );
-	pointer-events: none;
-	z-index: z-index( 'root', '.editor-action-bar__saved-status' );
+	.editor-status-label {
+		line-height: 1;
+		position: fixed;
+			bottom: 0px;
+			left: 8px;
+		padding: 8px;
+		margin-right: 2px;
+		background-color: rgba( $white, 0.92 );
+		text-transform: uppercase;
+		font-size: 11px;
+		line-height: 1;
+		color: lighten( $gray, 10% );
+		pointer-events: none;
+		z-index: z-index( 'root', '.editor-action-bar .editor-status-label' );
 
-	@include breakpoint( "<480px" ) {
-		display: none;
-	}
+		@include breakpoint( "<480px" ) {
+			display: none;
+		}
 
-	.focus-sidebar & {
-		right: 228px;
+		.focus-sidebar & {
+			right: 228px;
 
-		@include breakpoint( ">960px" ) {
-			right: 273px;
+			@include breakpoint( ">960px" ) {
+				right: 273px;
+			}
 		}
 	}
 }
diff --git a/client/post-editor/editor-status-label/index.jsx b/client/post-editor/editor-status-label/index.jsx
index 5e9ec309615f51..0ec8f37df01212 100644
--- a/client/post-editor/editor-status-label/index.jsx
+++ b/client/post-editor/editor-status-label/index.jsx
@@ -19,8 +19,7 @@ export default React.createClass( {
 		onClick: React.PropTypes.func,
 		post: React.PropTypes.object,
 		type: React.PropTypes.string,
-		advancedStatus: React.PropTypes.bool,
-		className: React.PropTypes.string,
+		advancedStatus: React.PropTypes.bool
 	},
 
 	mixins: [ PureRenderMixin ],
@@ -68,7 +67,7 @@ export default React.createClass( {
 
 		if ( ! this.props.onClick ) {
 			return (
-				<span className={ classNames( statusClass, this.props.className, 'is-plain' ) }>
+				<span className={ classNames( statusClass, 'is-plain' ) }>
 					{ this.renderLabel() }
 				</span>
 			);
diff --git a/client/post-editor/style.scss b/client/post-editor/style.scss
index 0c68bb3210a9ec..9b7780373b26c5 100644
--- a/client/post-editor/style.scss
+++ b/client/post-editor/style.scss
@@ -140,7 +140,6 @@
 	resize: none;
 	border-width: 0;
 	padding: 32px 11px; /* Inherited from TinyMCE iframe body */
-	margin-bottom: 64px;
 
 	// typography for HTML view
 	font-family: $monospace;