diff --git a/packages/block-library/src/code/edit.js b/packages/block-library/src/code/edit.js
index a3dbedeaf23352..5e3c6db3bf0db5 100644
--- a/packages/block-library/src/code/edit.js
+++ b/packages/block-library/src/code/edit.js
@@ -29,6 +29,7 @@ export default function CodeEdit( {
 				__unstableOnSplitAtDoubleLineEnd={ () =>
 					insertBlocksAfter( createBlock( getDefaultBlockName() ) )
 				}
+				style={ { whiteSpace: 'break-spaces' } }
 			/>
 		</pre>
 	);
diff --git a/packages/block-library/src/code/style.scss b/packages/block-library/src/code/style.scss
index ccc950d19b552c..b67163c10d3fce 100644
--- a/packages/block-library/src/code/style.scss
+++ b/packages/block-library/src/code/style.scss
@@ -8,7 +8,7 @@
 		display: block;
 		font-family: inherit;
 		overflow-wrap: break-word;
-		white-space: pre-wrap;
+		white-space: break-spaces;
 		// Set direction and avoid inheriting alignment from a parent element.
 		/*!rtl:begin:ignore*/
 		direction: ltr;
diff --git a/packages/rich-text/src/hook/use-default-style.js b/packages/rich-text/src/hook/use-default-style.js
index 5d45d027034fa4..f09bd42b783796 100644
--- a/packages/rich-text/src/hook/use-default-style.js
+++ b/packages/rich-text/src/hook/use-default-style.js
@@ -30,6 +30,6 @@ export function useDefaultStyle() {
 		if ( ! element ) {
 			return;
 		}
-		element.style.whiteSpace = whiteSpace;
+		element.style.whiteSpace = element.style.whiteSpace || whiteSpace;
 	}, [] );
 }