diff --git a/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx b/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx
index 5484fe0eb..0ae8c0b62 100644
--- a/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx
+++ b/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx
@@ -116,11 +116,6 @@ const Compose = ({
                 src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                 props={{
                   content: state.data,
-                  embeddCSS: `
-                body{
-                  font-size:14px;
-                }
-                `,
                 }}
               />
             </div>
@@ -189,11 +184,6 @@ const Compose = ({
                 src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                 props={{
                   content: state.data,
-                  embeddCSS: `
-                    body {
-                      font-size: 14px;
-                    }
-                  `,
                 }}
               />
             </div>
diff --git a/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx b/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
index bdaa0fd25..d5709ac87 100644
--- a/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
+++ b/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
@@ -1,139 +1,81 @@
 const content = props.content ?? "";
-const height = props.height;
 const embeddCSS = props.embeddCSS;
-const [iframeHeight, setIframeHeight] = useState("100px");
 
-const code = `
-    <!doctype html>
-    <html>
-    <head>
-      <meta charset="utf-8" />
-      <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
-      <link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/latest/styles/github.min.css">
-      <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
-      <style>
-      body {  
-        margin: 0;
-        overflow: ${height ? "auto" : "hidden"};
-        font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-        line-height:1.5;
-        font-weight:300;
-        color:#212529;
-      }
+const simplemdeCss = fetch(
+  "https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css"
+).body;
+const githubCss = fetch(
+  "https://cdn.jsdelivr.net/highlight.js/latest/styles/github.min.css"
+).body;
 
-      blockquote {
-        margin: 1em 0;
-        padding-left: 1.5em;
-        border-left: 4px solid #ccc;
-        color: #666;
-        font-style: italic;
-        font-size: inherit;
-      }
+const bootstrapCss = fetch(
+  "https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css"
+).body;
 
-      .no-margin {
-        margin: 0px !important;
-      }
+if (!simplemdeCss || !githubCss || !bootstrapCss) return "";
 
-      h1, h2, h3, h4, h5, h6 {
-        font-weight:500;
-        margin-block:5px;
-      }
-
-      p {
-        white-space: pre-wrap;
-      }
-
-      img {
-        height: 200px;
-        object-fit:contain;
-        width: -webkit-fill-available;
-      }
-
-      table {
-        border: 1px solid #dee2e6;
-      }
+const CssContainer = styled.div`
+  ${githubCss}
+  ${simplemdeCss}
   
-      table th, table td {
-        padding: 0.75rem;
-        vertical-align: top;
-      }
+  font-size:14px;
+  p {
+    white-space: normal;
+  }
 
-      table td {
-        border-top: 1px solid #dee2e6;
-      }
-      
-      table thead th {
-        vertical-align: bottom;
-        border-bottom: 2px solid #dee2e6;
-      }
-      
-      table tbody + tbody {
-        border-top: 2px solid #dee2e6;
-      }
-      
-      /* Zebra-striping */
-      tbody tr:nth-of-type(odd) {
-        background-color: rgba(0, 0, 0, 0.05);
-      }
+  blockquote {
+    margin: 1em 0;
+    padding-left: 1.5em;
+    border-left: 4px solid #ccc;
+    color: #666;
+    font-style: italic;
+    font-size: inherit;
+  }
 
-      ${embeddCSS}
-    </style>
-      </head> 
-    <body>
-      <div id="content"></div>
-      <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
-      <script>
-      
-    
+  pre {
+    background-color: #f4f4f4;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 1em;
+    overflow-x: auto;
+    font-family: "Courier New", Courier, monospace;
+  }
 
-      function updateContent(content) {
-        document.getElementById('content').innerHTML = marked.parse(content)
+  a {
+    color: #04a46e;
+  }
 
-        const newHeight = Math.max(
-          document.body.scrollHeight,
-          document.documentElement.scrollHeight,
-          document.body.offsetHeight,
-          document.documentElement.offsetHeight
-        );
-        
-        window.parent.postMessage({
-          handler: 'IFRAME_HEIGHT',
-          height: newHeight
-        }, '*');
-      }
+  .remove-underline a {
+    text-decoration: none !important;
+  }
 
-      window.addEventListener('message', (event) => {
-        if (event.data.content) {
-          updateContent(event.data.content);
-        }
-      });
+  ${embeddCSS}
+`;
 
-      window.addEventListener('load', () => {
-        window.parent.postMessage({
-          handler: 'IFRAME_HEIGHT',
-          height: document.body.scrollHeight
-        }, '*');
-      });
-      </script>
-    </body>
-    </html>
-  `;
+const renderMention =
+  props.renderMention ??
+  ((accountId) => (
+    <span
+      key={accountId}
+      className="d-inline-flex remove-underline"
+      style={{ fontWeight: 500 }}
+    >
+      <Widget
+        src="${REPL_DEVHUB}/widget/devhub.components.molecule.ProfileLine"
+        props={{
+          accountId: accountId.toLowerCase(),
+          hideAccountId: true,
+          tooltip: true,
+        }}
+      />
+    </span>
+  ));
 
+const processedContent = content
+  .replace(/<br\s*\/?>/gi, "  \n")
+  .replace(/\n/g, "  \n");
 return (
-  <iframe
-    srcDoc={code}
-    message={{
-      content: content,
-    }}
-    style={{ height: height ?? iframeHeight }}
-    className="w-100"
-    onMessage={(e) => {
-      switch (e.handler) {
-        case "IFRAME_HEIGHT": {
-          setIframeHeight(`${e.height}px`);
-          break;
-        }
-      }
-    }}
-  />
+  <CssContainer>
+    <Markdown text={processedContent} onMention={renderMention} />
+  </CssContainer>
 );
diff --git a/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx b/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
index a62eb0bc4..d05607f11 100644
--- a/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
+++ b/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
@@ -222,11 +222,6 @@ const Comment = ({ commentItem }) => {
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: content.text,
-                embeddCSS: `
-                  body {
-                    font-size:14px;
-                  }
-                `,
               }}
             />
 
diff --git a/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx b/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx
index 13ebbc3f0..d28d4ec44 100644
--- a/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx
+++ b/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx
@@ -870,11 +870,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px;
-                        }
-                       `,
                       }}
                     />
 
diff --git a/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx b/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx
index 9991f9e3f..637f4c8dc 100644
--- a/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx
+++ b/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx
@@ -108,11 +108,6 @@ const Compose = ({
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: state.data,
-                embeddCSS: `
-                body {
-                  font-size: 14px;
-                }
-                `,
               }}
             />
           </div>
diff --git a/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx b/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
index 2279f8c46..77b5abeee 100644
--- a/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
+++ b/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
@@ -222,11 +222,6 @@ const Comment = ({ commentItem }) => {
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: content.text,
-                embeddCSS: `
-                body {
-                  font-size: 14px;
-                }
-                `,
               }}
             />
 
diff --git a/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx b/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx
index 8d31fcfc8..f172e095e 100644
--- a/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx
+++ b/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx
@@ -868,11 +868,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px;
-                        }
-                      `,
                       }}
                     />
 
diff --git a/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx b/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
index 7a4a03058..df8ae5486 100644
--- a/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
+++ b/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
@@ -103,16 +103,11 @@ const Compose = ({
             />
           </>
         ) : (
-          <div className="card-body">
+          <div className="card-body compose-preview">
             <Widget
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: state.data,
-                embeddCSS: `
-                  body {
-                    font-size: 14px !important;
-                  }
-                `,
               }}
             />
           </div>
diff --git a/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx b/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx
index 5aefc8d7d..7b4c9b1d9 100644
--- a/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx
+++ b/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx
@@ -848,11 +848,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px !important;
-                        }
-                        `,
                       }}
                     />
 
diff --git a/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx b/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx
index 5392169d6..47268022b 100644
--- a/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx
+++ b/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx
@@ -671,11 +671,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px;
-                        }
-                        `,
                       }}
                     />
 
diff --git a/playwright-tests/tests/events/proposals.spec.js b/playwright-tests/tests/events/proposals.spec.js
index 5545397a5..15859e748 100644
--- a/playwright-tests/tests/events/proposals.spec.js
+++ b/playwright-tests/tests/events/proposals.spec.js
@@ -481,7 +481,6 @@ test.describe("Wallet is connected", () => {
     const delay_milliseconds_between_keypress_when_typing = 0;
     const commentEditor = page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentEditor.focus();
     await commentEditor.pressSequentially(
@@ -492,7 +491,7 @@ test.describe("Wallet is connected", () => {
     );
 
     await pauseIfVideoRecording(page);
-    const iframe = page.frameLocator("iframe").last();
+    const iframe = page.frameLocator("iframe");
     const liFrameLocators = iframe.frameLocator(
       'ul[id="mentiondropdown"] > li'
     );
diff --git a/playwright-tests/tests/infrastructure/infrastructure.near.spec.js b/playwright-tests/tests/infrastructure/infrastructure.near.spec.js
index 22347058f..756ae63ac 100644
--- a/playwright-tests/tests/infrastructure/infrastructure.near.spec.js
+++ b/playwright-tests/tests/infrastructure/infrastructure.near.spec.js
@@ -11,7 +11,7 @@ test.describe("Wallet is connected", () => {
     await expect(aboutHeaderLink).toBeVisible();
     await aboutHeaderLink.click();
     await expect(
-      page.frameLocator("iframe").getByRole("heading", { name: "Introduction" })
+      page.getByRole("heading", { name: "Introduction" })
     ).toBeVisible();
 
     const proposalsHeaderLink = await page.getByRole("link", {
diff --git a/playwright-tests/tests/infrastructure/proposal.spec.js b/playwright-tests/tests/infrastructure/proposal.spec.js
index b28b0bcf2..6805815ba 100644
--- a/playwright-tests/tests/infrastructure/proposal.spec.js
+++ b/playwright-tests/tests/infrastructure/proposal.spec.js
@@ -167,12 +167,12 @@ test.describe("Wallet is connected as admin", () => {
     await createProposal(page, false);
   });
 
-  test("should show relevant users in mention autocomplete", async ({
+  test("should show relevant users in mention autocomplete and correct name and image in viewer", async ({
     page,
     account,
   }) => {
+    test.setTimeout(120000);
     await page.goto(`/${account}/widget/app?page=proposal&id=1`);
-
     await page.waitForSelector(`iframe`, {
       state: "visible",
     });
@@ -196,7 +196,6 @@ test.describe("Wallet is connected as admin", () => {
     const delay_milliseconds_between_keypress_when_typing = 0;
     const commentEditor = page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentEditor.focus();
     await commentEditor.pressSequentially(
@@ -207,7 +206,7 @@ test.describe("Wallet is connected as admin", () => {
     );
 
     await pauseIfVideoRecording(page);
-    const iframe = page.frameLocator("iframe").last();
+    const iframe = page.frameLocator("iframe");
     const liFrameLocators = iframe.frameLocator(
       'ul[id="mentiondropdown"] > li'
     );
@@ -227,5 +226,71 @@ test.describe("Wallet is connected as admin", () => {
     // When I manually test, it shows the correct 4 users
     expect(mentionSuggestions.slice(0, 4)).toEqual(expected);
     await pauseIfVideoRecording(page);
+
+    await page
+      .frameLocator("iframe")
+      .getByRole("button", { name: "hemera.near" })
+      .click();
+    await commentEditor.pressSequentially(" test");
+    await page.waitForTimeout(1000);
+    await page.getByRole("button", { name: "Preview" }).click();
+    await page.waitForTimeout(10_000);
+    const accountLink = page
+      .locator(".compose-preview")
+      .locator("div[data-component='mob.near/widget/ProfileImage']");
+    await expect(accountLink).toBeVisible({ timeout: 20_000 });
+    accountLink.click();
+    await page.waitForNavigation();
+    await expect(page).toHaveURL(
+      /mob\.near\/widget\/ProfilePage\?accountId=hemera\.near/
+    );
+  });
+
+  test("should show links in markdown viewer", async ({ page, account }) => {
+    test.setTimeout(120000);
+    await page.goto(`/${account}/widget/app?page=proposal&id=1`);
+    await page.goto(`/${account}/widget/app?page=proposal&id=1`);
+    await page.waitForSelector(`iframe`, {
+      state: "visible",
+    });
+
+    const proposal = page.getByRole("link", { name: "hemera.near" }).first();
+    await proposal.waitFor();
+    await proposal.scrollIntoViewIfNeeded();
+
+    const comment = page
+      .getByRole("link", { name: "trechriron71.near" })
+      .first();
+    await comment.waitFor();
+    await comment.scrollIntoViewIfNeeded();
+
+    const heading = page.getByText("Add a comment");
+    await heading.waitFor();
+    await heading.scrollIntoViewIfNeeded();
+
+    await page.waitForTimeout(5000);
+
+    const delay_milliseconds_between_keypress_when_typing = 0;
+    const commentEditor = page
+      .frameLocator("iframe")
+      .locator(".CodeMirror textarea");
+    await commentEditor.focus();
+    await commentEditor.pressSequentially(
+      `Adding a test [link](https://www.google.com/)`,
+      {
+        delay: delay_milliseconds_between_keypress_when_typing,
+      }
+    );
+    await page.waitForTimeout(1000);
+    await page.getByRole("button", { name: "Preview" }).click();
+
+    // make sure links open in new tab
+    const link = await page.getByRole("link", { name: "link" });
+    expect(link).toBeVisible();
+    link.click();
+    const pagePromise = page.waitForEvent("popup");
+    const newTab = await pagePromise;
+    await newTab.waitForLoadState();
+    await expect(newTab).toHaveURL("https://www.google.com");
   });
 });
diff --git a/playwright-tests/tests/other/feed.dontaskagain.spec.js b/playwright-tests/tests/other/feed.dontaskagain.spec.js
index 08327a3fd..1b18713b1 100644
--- a/playwright-tests/tests/other/feed.dontaskagain.spec.js
+++ b/playwright-tests/tests/other/feed.dontaskagain.spec.js
@@ -42,7 +42,6 @@ test.describe("Wallet is connected with devhub access key", () => {
 
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await commentArea.fill("Some comment");
@@ -159,7 +158,7 @@ test.describe("Wallet is connected with devhub access key", () => {
     await pauseIfVideoRecording(page);
     await page.waitForTimeout(10_000);
     const commentArea = await page
-      .frameLocator("#accordion2261 iframe")
+      .frameLocator("iframe")
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await page.waitForTimeout(100);
@@ -222,7 +221,6 @@ test.describe("Wallet is connected", () => {
 
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await commentArea.fill("Some comment");
diff --git a/playwright-tests/tests/proposal/comment.spec.js b/playwright-tests/tests/proposal/comment.spec.js
index 8414ad788..0dde423de 100644
--- a/playwright-tests/tests/proposal/comment.spec.js
+++ b/playwright-tests/tests/proposal/comment.spec.js
@@ -35,7 +35,6 @@ test.describe("Don't ask again enabled", () => {
     const delay_milliseconds_between_keypress_when_typing = 0;
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus({ timeout: 20_000 });
     const text = "Comment testing";
@@ -83,10 +82,10 @@ test.describe("Don't ask again enabled", () => {
     );
     const commentButton = await page.getByRole("button", { name: "Comment" });
     await expect(commentButton).toBeAttached();
-    await commentButton.scrollIntoViewIfNeeded();
+    await commentButton.scrollIntoViewIfNeeded({ timeout: 10_000 });
     await commentButton.click();
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText(text);
 
     const loadingIndicator = await page.locator(".comment-btn-spinner");
@@ -101,10 +100,10 @@ test.describe("Don't ask again enabled", () => {
 
     await expect(transaction_successful_toast).not.toBeAttached();
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).not.toContainText(text);
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText("Add your comment here...");
     await pauseIfVideoRecording(page);
   });
@@ -131,7 +130,6 @@ test.describe("Don't ask again enabled", () => {
 
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await page.waitForTimeout(100);
@@ -250,10 +248,10 @@ test.describe("Don't ask again enabled", () => {
       timeout: 10000,
     });
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).not.toContainText(commentText);
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText("Add your comment here...");
 
     const submittedTransactionJsonObject =
@@ -262,9 +260,8 @@ test.describe("Don't ask again enabled", () => {
       submittedTransactionJsonObject.data["petersalomonsen.near"].post.comment
     );
     expect(submittedComment.text).toEqual(commentText);
-    let commentElement = await page
-      .frameLocator("#theorinear121684809 iframe")
-      .locator("#content");
+    let commentElement = await page.locator("#theorinear121684809 div").nth(4);
+
     await expect(commentElement).toBeVisible({ timeout: 30_000 });
     await expect(commentElement).toContainText(
       "Typically, funds are disbursed within 10 business days, but the timeline can vary depending on the project's complexity and paperwork. Your DevDAO Moderator will keep you updated.",
@@ -273,9 +270,7 @@ test.describe("Don't ask again enabled", () => {
 
     await page.reload();
 
-    commentElement = await page
-      .frameLocator("#theorinear121684809 iframe")
-      .locator("#content");
+    commentElement = await page.locator("#theorinear121684809 div").nth(4);
     await expect(commentElement).toBeVisible({ timeout: 30_000 });
     await expect(commentElement).toContainText(
       "Typically, funds are disbursed within 10 business days, but the timeline can vary depending on the project's complexity and paperwork. Your DevDAO Moderator will keep you updated.",
@@ -290,7 +285,7 @@ test.describe("Don't ask again enabled", () => {
     await page.waitForTimeout(5000);
 
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText("Add your comment here...");
 
     await pauseIfVideoRecording(page);
diff --git a/playwright-tests/tests/sunset/feed.spec.js b/playwright-tests/tests/sunset/feed.spec.js
index bf49907c2..b35209477 100644
--- a/playwright-tests/tests/sunset/feed.spec.js
+++ b/playwright-tests/tests/sunset/feed.spec.js
@@ -143,7 +143,6 @@ test.describe("Wallet is connected", () => {
     await page.getByRole("button", { name: "Comment" }).click();
     await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea")
       .fill("The comment to the idea");
 
diff --git a/playwright-tests/tests/sunset/funding.spec.js b/playwright-tests/tests/sunset/funding.spec.js
index a4b0657f4..c3467ab34 100644
--- a/playwright-tests/tests/sunset/funding.spec.js
+++ b/playwright-tests/tests/sunset/funding.spec.js
@@ -122,7 +122,7 @@ test.describe("Wallet is connected by moderator", () => {
     await page.getByLabel("Select currency").selectOption("USDC");
 
     const descriptionInput = page
-      .frameLocator("#accordion2586 iframe")
+      .frameLocator("iframe")
       .locator(".CodeMirror textarea");
     await descriptionInput.focus();
     await page.waitForTimeout(100);
