diff --git a/app/views/articles/_full_comment_area.html.erb b/app/views/articles/_full_comment_area.html.erb
index ce6e2b8a8..696d9ba36 100644
--- a/app/views/articles/_full_comment_area.html.erb
+++ b/app/views/articles/_full_comment_area.html.erb
@@ -6,12 +6,13 @@
         <div id="comment-subscription">
           <div role="presentation" class="crayons-btn-group">
             <span class="crayons-btn crayons-btn--outlined">Subscribe</span>
-          </div>  
+          </div>
         </div>
       </header>
 
       <div
         id="comments-container"
+        data-testid="comments-container"
         data-commentable-id="<%= @article.id %>"
         data-commentable-type="Article"
         data-has-recent-comment-activity="<%= @article.has_recent_comment_activity? %>">
diff --git a/cypress/integration/articleFlows/commentOnArticle.spec.js b/cypress/integration/articleFlows/commentOnArticle.spec.js
index 9c88e21b9..0ef0c4b8a 100644
--- a/cypress/integration/articleFlows/commentOnArticle.spec.js
+++ b/cypress/integration/articleFlows/commentOnArticle.spec.js
@@ -257,11 +257,12 @@ describe('Comment on articles', () => {
 
     cy.findByRole('link', { name: /Reply/ });
 
-    // Wait for the comment to save
-    cy.findByText('Edit');
-
-    cy.findAllByLabelText('Toggle dropdown menu').last().click();
-    cy.findByText('Edit').click();
+    cy.findByTestId('comments-container').within(() => {
+      cy.findByLabelText('Toggle dropdown menu').click();
+      // Wait for the menu to be visible
+      cy.findByText('Edit').should('be.visible');
+      cy.findByText('Edit').click();
+    });
 
     cy.findByDisplayValue('first comment').should('exist');
   });