diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 66d42d1148..6f30221831 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -1244,6 +1244,16 @@ table.links-table {
 /* DFW 2
 -------------------------------------------------------------- */
 
+#wp-content-wrap .mce-wp-dfw,
+#qt_content_dfw {
+	display: none;
+}
+
+.wp-editor-expand #wp-content-wrap .mce-wp-dfw,
+.wp-editor-expand #qt_content_dfw {
+	display: inline-block;
+}
+
 .focus-on .wrap > h2,
 .focus-on #wpfooter,
 .focus-on .postbox-container,
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index c1cb697405..daba46c315 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -2044,7 +2044,7 @@ final class WP_Internal_Pointers {
 
 	public static function pointer_wp410_dfw() {
 		// Don't show when editor-scrolling is not used.
-		if ( empty( $GLOBALS['_content_editor_dfw'] ) ) {
+		if ( empty( $GLOBALS['_wp_editor_expand'] ) ) {
 			return;
 		}