diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 77b7b89..2ab487a 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -14,9 +14,13 @@ export function registerBlock(id:string, label:string, component:any, icon:strin
 export function markdownToHtml (mdString:string) {
   // Adapted from https://randyperkins2k.medium.com/writing-a-simple-markdown-parser-using-javascript-1f2e9449a558
   return mdString
-    .replace(/(?<!\\)\*(?<!\\)\*(.*?)(?<!\\)\*(?<!\\)\*/g, '<strong>$1</strong>')
-    .replace(/(?<!\\)\*(.*?)(?<!\\)\*/g, '<em>$1</em>')
-    .replace(/\\\*/g, '*')
+    .replace(/\\\*/g, '\\*\\*')
+    .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
+    .replace(/\*(.*?)\*/g, '<em>$1</em>')
+    .replaceAll('\\<em>\\</em>', '*')
+    // .replace(/(?<!\\)\*(?<!\\)\*(.*?)(?<!\\)\*(?<!\\)\*/g, '<strong>$1</strong>')
+    // .replace(/(?<!\\)\*(.*?)(?<!\\)\*/g, '<em>$1</em>')
+    // .replace(/\\\*/g, '*')
     .trim()
 }
 
diff --git a/tests/e2e/lotion.test.ts b/tests/e2e/lotion.test.ts
index ba3d3c4..da282b7 100644
--- a/tests/e2e/lotion.test.ts
+++ b/tests/e2e/lotion.test.ts
@@ -77,7 +77,7 @@ test('converting between types via keyboard should work and maintain caret posit
   await page.keyboard.type('/heading 2')
   await page.keyboard.press('Enter')
   // Wait for text to update to "Get Started"
-  await block.allTextContents()
+  await block.waitFor()
   // Testing caret position
   await page.keyboard.press('s')
   block = await page.locator('text="Get Startsed"')