diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/Tags.ts b/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/Tags.ts
index 66acc96eeeb..e21e4425286 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/Tags.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/Tags.ts
@@ -18,11 +18,13 @@ export const assignTags = (tag: string, endPoint: EntityType) => {
   interceptURL('PATCH', `/api/v1/${endPoint}/*`, 'addTags');
   cy.get(
     '[data-testid="entity-right-panel"] [data-testid="tags-container"] [data-testid="add-tag"]'
-  ).click();
+  )
+    .scrollIntoView()
+    .click();
 
   cy.get('[data-testid="tag-selector"] input').should('be.visible').type(tag);
 
-  cy.get(`[data-testid="tag-${tag}"]`).click();
+  cy.get(`[data-testid="tag-${tag}"]`).scrollIntoView().click();
 
   cy.get(
     `[data-testid="tag-selector"] [data-testid="selected-tag-${tag}"]`
@@ -32,27 +34,33 @@ export const assignTags = (tag: string, endPoint: EntityType) => {
   verifyResponseStatusCode('@addTags', 200);
   cy.get(
     `[data-testid="entity-right-panel"] [data-testid="tags-container"] [data-testid="tag-${tag}"]`
-  ).should('be.visible');
+  )
+    .scrollIntoView()
+    .should('be.visible');
 };
 
 export const updateTags = (tag: string, endPoint: EntityType) => {
   interceptURL('PATCH', `/api/v1/${endPoint}/*`, 'addTags');
   cy.get(
     '[data-testid="entity-right-panel"]  [data-testid="tags-container"] [data-testid="edit-button"]'
-  ).click();
+  )
+    .scrollIntoView()
+    .click();
 
   cy.get('[data-testid="tag-selector"] input').should('be.visible').type(tag);
 
-  cy.get(`[data-testid="tag-${tag}"]`).click();
+  cy.get(`[data-testid="tag-${tag}"]`).scrollIntoView().click();
 
-  cy.get(
-    `[data-testid="tag-selector"] [data-testid="selected-tag-${tag}"]`
-  ).should('be.visible');
+  cy.get(`[data-testid="tag-selector"] [data-testid="selected-tag-${tag}"]`)
+    .scrollIntoView()
+    .should('be.visible');
   cy.get('[data-testid="saveAssociatedTag"]').scrollIntoView().click();
   verifyResponseStatusCode('@addTags', 200);
   cy.get(
     `[data-testid="entity-right-panel"] [data-testid="tags-container"] [data-testid="tag-${tag}"]`
-  ).should('be.visible');
+  )
+    .scrollIntoView()
+    .should('be.visible');
 };
 
 export const removeTags = (
@@ -64,17 +72,21 @@ export const removeTags = (
   tags.forEach((tag) => {
     cy.get(
       '[data-testid="entity-right-panel"]  [data-testid="tags-container"] [data-testid="edit-button"]'
-    ).click();
+    )
+      .scrollIntoView()
+      .click();
 
     // Remove all added tags
-    cy.get(
-      `[data-testid="selected-tag-${tag}"] [data-testid="remove-tags"]`
-    ).click();
+    cy.get(`[data-testid="selected-tag-${tag}"] [data-testid="remove-tags"]`)
+      .scrollIntoView()
+      .click();
 
     cy.get('[data-testid="saveAssociatedTag"]').scrollIntoView().click();
     verifyResponseStatusCode('@removeTags', 200);
   });
   cy.get(
     '[data-testid="entity-right-panel"] [data-testid="tags-container"] [data-testid="add-tag"]'
-  ).should('be.visible');
+  )
+    .scrollIntoView()
+    .should('be.visible');
 };
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/common.ts b/openmetadata-ui/src/main/resources/ui/cypress/common/common.ts
index 94bce3c6cd7..9b44c3248fd 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/common/common.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/common/common.ts
@@ -301,7 +301,7 @@ export const addTableFieldTags = (
 
   interceptURL('PATCH', `/api/v1/${entity}/*`, 'patchTag');
 
-  cy.get('[data-testid="saveAssociatedTag"]').click();
+  cy.get('[data-testid="saveAssociatedTag"]').scrollIntoView().click();
 
   verifyResponseStatusCode('@patchTag', 200);
 
@@ -320,15 +320,19 @@ export const removeTableFieldTags = (
 ) => {
   cy.get(
     `[data-row-key="${dataRowKey}"] [data-testid="tags-container"] [data-testid="edit-button"]`
-  ).click();
+  )
+    .scrollIntoView()
+    .click();
 
   cy.get(
     `[data-testid="selected-tag-${classificationName}.${tagName}"] [data-testid="remove-tags"]`
-  ).click();
+  )
+    .scrollIntoView()
+    .click();
 
   interceptURL('PATCH', `/api/v1/${entity}/*`, `patchTag`);
 
-  cy.get('[data-testid="saveAssociatedTag"]').click();
+  cy.get('[data-testid="saveAssociatedTag"]').scrollIntoView().click();
 
   verifyResponseStatusCode(`@patchTag`, 200);
 
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts
index 01269c596f6..3db8ca137c5 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts
@@ -204,7 +204,6 @@ describe('Query Entity', { tags: 'DataAssets' }, () => {
     cy.get('[data-testid="entity-tags"] .ant-tag').filter(':visible').click();
     cy.get('[data-testid="tag-selector"]').type(DATA.tag);
     cy.get('[data-testid="tag-PersonalData.Personal"]').click();
-    cy.clickOutside();
     cy.get('[data-testid="saveAssociatedTag"]').scrollIntoView().click();
     verifyResponseStatusCode('@patchQuery', 200);
   });
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/MyData.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/MyData.spec.ts
index 47e2e8a02d2..a8e6b963de9 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/MyData.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/MyData.spec.ts
@@ -334,7 +334,9 @@ describe('My Data page', { tags: 'DataAssets' }, () => {
     cy.logout();
   });
 
-  it('Verify user as owner feed widget', () => {
+  // Todo: Fix the following tests once new layout is implemented for feed https://github.com/open-metadata/OpenMetadata/issues/13871 @Ashish8689 @aniketkatkar97
+
+  it.skip('Verify user as owner feed widget', () => {
     // login with newly created user
     cy.login(user2.email, user2.password);
     cy.get('[data-testid="no-data-placeholder-container"]')
@@ -363,7 +365,7 @@ describe('My Data page', { tags: 'DataAssets' }, () => {
     cy.logout();
   });
 
-  it('Verify team as owner feed widget', () => {
+  it.skip('Verify team as owner feed widget', () => {
     // login with newly created user
     cy.login(user1.email, user1.password);