diff --git a/src/wp-admin/js/wp-fullscreen.js b/src/wp-admin/js/wp-fullscreen.js
index de73060ae5..70f2900a9f 100644
--- a/src/wp-admin/js/wp-fullscreen.js
+++ b/src/wp-admin/js/wp-fullscreen.js
@@ -198,6 +198,9 @@
 			s.$dfwTitle = null;
 		}
 
+		$( '#fullscreen-overlay' ).css( 'background-color', s.editor.dom.getStyle( s.editor.getBody(), 'background-color', true ) );
+		s.$dfwTitle.add( s.$editorContainer ).css( 'color', s.editor.dom.getStyle( s.editor.getBody(), 'color', true ) );
+
 		api.ui.fade( 'show', 'showing', 'shown' );
 	};
 
@@ -413,6 +416,8 @@
 	});
 
 	ps.subscribe( 'hiding', function() { // This event occurs while the overlay blocks the DFW UI.
+		s.$dfwTitle.add( s.$editorContainer ).css( 'color', '' );
+
 		$body.removeClass( 'wp-fullscreen-active' );
 
 		if ( s.$dfwTitle ) {
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index 05184a304d..4f2661d0c8 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -1797,7 +1797,7 @@ i.mce-i-hr:before {
 .wp-fullscreen-active.wp-dfw-show-ui .wp-editor-container {
 	-webkit-transition-duration: 0.4s;
 	transition-duration: 0.4s;
-	border-color: #ccc;
+	border-color: currentColor;
 }
 
 .fade-1000,
@@ -1846,7 +1846,7 @@ i.mce-i-hr:before {
 
 .wp-fullscreen-active.wp-dfw-touch  .wp-fullscreen-title,
 .wp-fullscreen-active.wp-dfw-touch .wp-editor-container {
-	border-color: #ccc;
+	border-color: currentColor;
 }
 
 .wp-dfw-touch #wp-fullscreen-statusbar {
diff --git a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index 4b907dfba5..111952f598 100644
--- a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -37,7 +37,6 @@ body.webkit b {
 /* DFW mode */
 html.wp-fullscreen,
 html.wp-fullscreen body {
-	background: transparent;
 	width: auto;
 	max-width: none;
 	min-height: 0;