diff --git a/codeceptjs-e2e/tests/pages/components/queryAnalytics/queryAnalyticsData.js b/codeceptjs-e2e/tests/pages/components/queryAnalytics/queryAnalyticsData.js
index 7113a211b..92000cbb9 100644
--- a/codeceptjs-e2e/tests/pages/components/queryAnalytics/queryAnalyticsData.js
+++ b/codeceptjs-e2e/tests/pages/components/queryAnalytics/queryAnalyticsData.js
@@ -154,17 +154,16 @@ class QueryAnalyticsData {
     I.waitForVisible(this.elements.queryRow(0), 30);
     I.waitForVisible(this.fields.searchBy, 30);
     I.wait(1);
-    I.clearField(this.fields.searchBy);
     I.click(this.fields.searchBy);
     I.fillField(this.fields.searchBy, value);
     I.pressKey('Enter');
+    queryAnalyticsPage.waitForLoaded();
   }
 
   click(value) {
     I.waitForVisible(this.elements.queryRow(0), 30);
     I.waitForVisible(this.fields.searchBy, 30);
     I.wait(1);
-    I.clearField(this.fields.searchBy);
     I.click(this.fields.searchBy);
     I.fillField(this.fields.searchBy, value);
   }
@@ -179,6 +178,7 @@ class QueryAnalyticsData {
     I.click(this.fields.searchBy);
     I.wait(1);
     I.clearField(this.fields.searchBy);
+    queryAnalyticsPage.waitForLoaded();
   }
 
   async getCountOfItems() {