1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java b/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java
index 8a7408d..29666be 100644
--- a/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java
+++ b/src/main/java/com/mavlushechka/a1qa/elements/BaseElement.java
@@ -41,17 +41,13 @@ public abstract class BaseElement {
     }
 
     public boolean isVisible() {
-        WebElement webElement = find();
-
         LoggerUtils.info("Getting visibility of the \"" + name + "\" element.");
-        return WebDriverWaitFactory.createWebDriverWait().until(ExpectedConditions.visibilityOf(webElement)).isDisplayed();
+        return WebDriverWaitFactory.createWebDriverWait().until(ExpectedConditions.visibilityOfElementLocated(locator)).isDisplayed();
     }
 
     public boolean isInvisible() {
-        WebElement webElement = find();
-
         LoggerUtils.info("Getting invisibility of the \"" + name + "\" element.");
-        return WebDriverWaitFactory.createWebDriverWait().until(ExpectedConditions.invisibilityOf(webElement));
+        return WebDriverWaitFactory.createWebDriverWait().until(ExpectedConditions.invisibilityOfElementLocated(locator));
     }
 
     public String getName() {
@@ -73,6 +69,7 @@ public abstract class BaseElement {
     }
 
     protected WebElement find() {
+        isVisible();
         LoggerUtils.info("Finding the \"" + name + "\" element.");
         return WebDriverUtils.findElement(locator);
     }