diff --git a/src/main/java/io/cdap/e2e/pages/actions/CdfConnectionActions.java b/src/main/java/io/cdap/e2e/pages/actions/CdfConnectionActions.java
index 11c3ff42e..e210de894 100644
--- a/src/main/java/io/cdap/e2e/pages/actions/CdfConnectionActions.java
+++ b/src/main/java/io/cdap/e2e/pages/actions/CdfConnectionActions.java
@@ -126,7 +126,8 @@ public static void waitTillConnectionDataLoadingCompletes(long timeoutInSeconds)
    * Example : For GCS pass actual bucket name as parameter.
    */
   private static void selectConnectionDataRow(String dataRow) {
-    waitTillConnectionDataLoadingCompletes(ConstantsUtil.DEFAULT_TIMEOUT_SECONDS);
+    WaitHelper.waitForElementToBeClickable(CdfConnectionLocators.searchDirectoryInput,
+                                           ConstantsUtil.DEFAULT_TIMEOUT_SECONDS);
     ElementHelper.sendKeys(CdfConnectionLocators.searchDirectoryInput, dataRow);
     WaitHelper.waitForTextToBePresentInElementValue(CdfConnectionLocators.searchDirectoryInput, dataRow);
     int attempts = 0;