diff --git a/dev/Styles/SquireUI.less b/dev/Styles/SquireUI.less
index 430c58e25..b3dffe748 100644
--- a/dev/Styles/SquireUI.less
+++ b/dev/Styles/SquireUI.less
@@ -60,12 +60,14 @@
 .squire-wysiwyg div:-moz-only-whitespace {
 	min-height: 1em;
 }
-.squire-wysiwyg div:empty:before,
-.squire-wysiwyg div:-moz-only-whitespace:before {
+/*
+.squire-wysiwyg div:empty::before,
+.squire-wysiwyg div:-moz-only-whitespace::before {
 	content: "Start writing here…";
 	opacity: 0.5;
-	position: absolute
+	-moz-user-select: text;
 }
+*/
 
 .squire-wysiwyg, .squire-plain {
 	min-height: 200px;
diff --git a/vendors/squire/build/squire-raw.js b/vendors/squire/build/squire-raw.js
index eed403276..4e5900d15 100644
--- a/vendors/squire/build/squire-raw.js
+++ b/vendors/squire/build/squire-raw.js
@@ -241,7 +241,7 @@ const
 
 	fixCursor = ( node, root ) => {
 		// In Webkit and Gecko, block level elements are collapsed and
-		// unfocusable if they have no content. To remedy this, a <BR> must be
+		// unfocusable if they have no content (:empty). To remedy this, a <BR> must be
 		// inserted. In Opera and IE, we just need a textnode in order for the
 		// cursor to appear.
 		let self = root.__squire__;
@@ -281,10 +281,9 @@ const
 					fixer = doc.createTextNode( '' );
 				}
 			}
-		} else if ( !node.querySelector( 'BR' ) ) {
+//		} else if ( !node.querySelector( 'BR' ) ) {
+		} else if ( node.matches( ':empty' ) ) {
 			fixer = createElement( doc, 'BR' );
-//			fixer = doc.createTextNode( ZWS );
-//			fixer = doc.createTextNode( NBSP );
 			while ( ( child = node.lastElementChild ) && !isInline( child ) ) {
 				node = child;
 			}