diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreSortOrderFilter.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreSortOrderFilter.spec.ts
index 4ebb5742068..5ae0af3c661 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreSortOrderFilter.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreSortOrderFilter.spec.ts
@@ -66,21 +66,53 @@ test.describe('Explore Sort Order Filter', () => {
 
       await page.waitForLoadState('networkidle');
 
-      await page.getByRole('button', { name: 'Data Assets' }).click();
+      await page.getByTestId('search-dropdown-Data Assets').click();
 
       await page.waitForSelector(
-        'data-testid="drop-down-menu" data-testid="loader"',
+        '[data-testid="drop-down-menu"] [data-testid="loader"]',
         {
           state: 'detached',
         }
       );
 
+      await page.waitForSelector(
+        '[data-testid="drop-down-menu"] [role="menu"]',
+        {
+          state: 'visible',
+        }
+      );
+
+      await page.waitForSelector(`[data-testid="${filter}-checkbox"]`, {
+        state: 'visible',
+      });
       await page.getByTestId(`${filter}-checkbox`).check();
       await page.getByTestId('update-btn').click();
 
       await selectSortOrder(page, 'Name');
       await verifyEntitiesAreSorted(page);
 
+      await page.getByTestId('search-dropdown-Data Assets').click();
+
+      await page.waitForSelector(
+        '[data-testid="drop-down-menu"] [data-testid="loader"]',
+        {
+          state: 'detached',
+        }
+      );
+
+      await page.waitForSelector(
+        '[data-testid="drop-down-menu"] [role="menu"]',
+        {
+          state: 'visible',
+        }
+      );
+
+      await page.waitForSelector(`[data-testid="${filter}-checkbox"]`, {
+        state: 'visible',
+      });
+      await page.getByTestId(`${filter}-checkbox`).uncheck();
+      await page.getByTestId('update-btn').click();
+
       await afterAction();
     });
   });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/tag.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/tag.ts
index 3306fa584b4..7261cb30bec 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/tag.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/tag.ts
@@ -64,8 +64,10 @@ export const visitClassificationPage = async (
   await sidebarClick(page, SidebarItem.TAGS);
   await classificationResponse;
 
+  await page.waitForLoadState('networkidle');
+
   await page.waitForSelector(
-    '[data-testid="tags-container"] [data-testid="loader"]',
+    '[data-testid="tags-container"] .table-container [data-testid="loader"]',
     { state: 'detached' }
   );