diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
index 717b0edbe2ed..48c3d3c12eb0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
@@ -3,6 +3,7 @@ import {
   dataSources,
   entityItems,
   homePage,
+  locators,
 } from "../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
@@ -70,13 +71,14 @@ describe(
         agHelper.RefreshPage();
         dataSources.CreateMockDB("Users");
         dataSources.CreateQueryAfterDSSaved();
-        dataSources.VerifyTableSchemaOnQueryEditor("public.users");
-        dataSources.SelectTableFromPreviewSchemaList("public.users");
-        dataSources.VerifyColumnSchemaOnQueryEditor("id", 1);
+        agHelper.GetNClick(dataSources._dsTabSchema);
+        agHelper.AssertElementAbsence(locators._btnSpinner);
         dataSources.FilterAndVerifyDatasourceSchemaBySearch(
           "public.us",
           "public.users",
         );
+        dataSources.SelectTableFromPreviewSchemaList("public.users");
+        dataSources.VerifyColumnSchemaOnQueryEditor("id", 1);
       },
     );
 
@@ -87,10 +89,13 @@ describe(
         agHelper.RefreshPage();
         dataSources.CreateMockDB("Users");
         dataSources.CreateQueryAfterDSSaved();
+        agHelper.GetNClick(dataSources._dsTabSchema);
+        dataSources.FilterAndVerifyDatasourceSchemaBySearch("public.users");
         dataSources.VerifyTableSchemaOnQueryEditor("public.users");
         // then refresh
         dataSources.RefreshDatasourceSchema();
         // assert the schema is still shown.
+        dataSources.FilterAndVerifyDatasourceSchemaBySearch("public.users");
         dataSources.VerifyTableSchemaOnQueryEditor("public.users");
       },
     );
diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt
index 31c0c0253fef..4b29b624fc7b 100644
--- a/app/client/cypress/limited-tests.txt
+++ b/app/client/cypress/limited-tests.txt
@@ -1,5 +1,5 @@
 # To run only limited tests - give the spec names in below format:
-cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
+cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
 
 # For running all specs - uncomment below:
 #cypress/e2e/**/**/*
diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts
index 50834a58fb7d..9292af87396f 100644
--- a/app/client/cypress/support/Pages/DataSources.ts
+++ b/app/client/cypress/support/Pages/DataSources.ts
@@ -311,6 +311,7 @@ export class DataSources {
   private _dsSchemaEntityItem = ".t--entity-item";
   private _entityTriggerElement = ".t--template-menu-trigger";
   _dsSchemaTableResponse = ".t--table-response";
+  _dsTabSchema = "[data-testid='t--tab-schema']";
 
   public AssertDSEditViewMode(mode: AppModes) {
     if (mode == "Edit") this.agHelper.AssertElementAbsence(this._editButton);
@@ -1373,7 +1374,7 @@ export class DataSources {
     expectedTableName = search,
   ) {
     this.agHelper.Sleep(2500); //for query editor to load
-    this.agHelper.TypeText(this._datasourceStructureSearchInput, search);
+    this.agHelper.ClearNType(this._datasourceStructureSearchInput, search);
     this.agHelper.Sleep(1000); //for search result to load
     this.VerifyTableSchemaOnQueryEditor(expectedTableName);
   }