diff --git a/wax-prosemirror-layouts/src/layouts/EditorElements.js b/wax-prosemirror-layouts/src/layouts/EditorElements.js
index b830a18428652b2696ef16b2f04527137b54411a..5d4b2de16433d7c2b729fa58f10b62630374473a 100644
--- a/wax-prosemirror-layouts/src/layouts/EditorElements.js
+++ b/wax-prosemirror-layouts/src/layouts/EditorElements.js
@@ -12,7 +12,15 @@ export default css`
     color: ${th('colorText')};
 
     p::selection,
-    p span::selection {
+    h1::selection,
+    h2::selection,
+    h3::selection,
+    code::selection,
+    p span::selection,
+    h1 span::selection,
+    h2 span::selection,
+    h3 span::selection,
+    code span::selection {
       background-color: transparent;
     }
 
diff --git a/wax-prosemirror-utilities/src/document/DocumentHelpers.js b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
index 3815010c85fd29af77fe2d748892895315e89946..969c6daf152815137a53476a23d2be26f0ce3900 100644
--- a/wax-prosemirror-utilities/src/document/DocumentHelpers.js
+++ b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
@@ -96,7 +96,7 @@ const findAllMarksWithSameId = (state, mark) => {
   return allMarksWithSameId;
 };
 
-// From https://discuss.prosemirror.net/t/expanding-the-selection-to-the-active-mark/478/2
+// From https://discuss.prosemirror.net/t/expanding-the-selection-to-the-active-mark/
 
 const findMarkPosition = (state, initialPos, markType) => {
   const $pos = state.tr.doc.resolve(initialPos);