diff --git a/blocks/editable/style.scss b/blocks/editable/style.scss
index 100e3b8f7f4af..3dd48643aa8ab 100644
--- a/blocks/editable/style.scss
+++ b/blocks/editable/style.scss
@@ -56,7 +56,7 @@
 	}
 }
 
-.drop-cap-true .blocks-editable__tinymce:not( :focus )  {
+.has-drop-cap .blocks-editable__tinymce:not( :focus )  {
 	&:first-letter {
 		float: left;
 		font-size: 4.1em;
@@ -69,7 +69,7 @@
 	}
 }
 
-.drop-cap-true:not( :focus )  {
+.has-drop-cap:not( :focus )  {
 	overflow: hidden;
 }
 
diff --git a/blocks/library/text/index.js b/blocks/library/text/index.js
index a8ab8f0d73f55..acdd6740d1b77 100644
--- a/blocks/library/text/index.js
+++ b/blocks/library/text/index.js
@@ -78,7 +78,7 @@ registerBlockType( 'core/text', {
 				} }
 				onMerge={ mergeBlocks }
 				style={ { textAlign: align } }
-				className={ `drop-cap-${ dropCap }` }
+				className={ dropCap && 'has-drop-cap' }
 				placeholder={ __( 'Write…' ) }
 			/>,
 		];