diff --git a/tests/e2e/markdown-editor.test.e2e.ts b/tests/e2e/markdown-editor.test.e2e.ts
index 762113d563..1e30b8d3b9 100644
--- a/tests/e2e/markdown-editor.test.e2e.ts
+++ b/tests/e2e/markdown-editor.test.e2e.ts
@@ -224,3 +224,29 @@ test('markdown insert table', async ({page}) => {
   await expect(textarea).toHaveValue('| Header  | Header  |\n|---------|---------|\n| Content | Content |\n| Content | Content |\n| Content | Content |\n');
   await save_visual(page);
 });
+
+test('text expander has higher prio then prefix continuation', async ({page}) => {
+  const response = await page.goto('/user2/repo1/issues/new');
+  expect(response?.status()).toBe(200);
+
+  const textarea = page.locator('textarea[name=content]');
+  const initText = `* first`;
+  await textarea.fill(initText);
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('rst'), it.value.indexOf('rst')));
+  await textarea.press('End');
+
+  // Test emoji completion
+  await textarea.press('Enter');
+  await textarea.pressSequentially(':smile_c');
+  await textarea.press('Enter');
+  await expect(textarea).toHaveValue(`* first\n* 😸`);
+
+  // Test username completion
+  await textarea.press('Enter');
+  await textarea.pressSequentially('@user');
+  await textarea.press('Enter');
+  await expect(textarea).toHaveValue(`* first\n* 😸\n* @user2 `);
+
+  await textarea.press('Enter');
+  await expect(textarea).toHaveValue(`* first\n* 😸\n* @user2 \n* `);
+});
diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js
index 8ae5defa47..707101190c 100644
--- a/web_src/js/features/comp/ComboMarkdownEditor.js
+++ b/web_src/js/features/comp/ComboMarkdownEditor.js
@@ -99,6 +99,8 @@ class ComboMarkdownEditor {
         e.target._shiftDown = true;
       }
       if (e.key === 'Enter' && !e.shiftKey && !e.ctrlKey && !e.altKey) {
+        // Prevent special line break handling if currently a text expander popup is open
+        if (this.textarea.hasAttribute('aria-expanded')) return;
         if (!this.breakLine()) return; // Nothing changed, let the default handler work.
         this.options?.onContentChanged?.(this, e);
         e.preventDefault();