diff --git a/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/navigation/TabPage.java b/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/navigation/TabPage.java
index 49d1d36896..d8f51bc7d8 100644
--- a/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/navigation/TabPage.java
+++ b/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/navigation/TabPage.java
@@ -21,6 +21,6 @@ public class TabPage extends WebPage {
     @UI("//h2[text()='Prevent scroll buttons']/following::div//div[@class='MuiTabs-root']")
     public static Tabs preventScrollTabs;
 
-    @UI("//h2[text()='Vertical tab']/following::div//div[@class='MuiTabs-root']")
+    @UI("//h2[text()='Vertical tab']/following::div//div[contains(@class,'MuiTabs-root')]")
     public static Tabs verticalTabs;
 }
diff --git a/jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/navigation/TabTests.java b/jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/navigation/TabTests.java
index b6c87b52b2..9bfe8a9870 100644
--- a/jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/navigation/TabTests.java
+++ b/jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/navigation/TabTests.java
@@ -20,6 +20,7 @@ public void before() {
 
     @Test
     public void simpleTabTest() {
+        simpleTabs.show();
         simpleTabs.has().values(equalTo(asList("ITEM ONE", "ITEM TWO", "ITEM THREE", "ITEM FOUR", "ITEM FIVE")));
         simpleTabs.has().selected(1).and().value("ITEM ONE");
         simpleTabs.select(2);
@@ -31,6 +32,7 @@ public void simpleTabTest() {
 
     @Test
     public void scrollableTabTest() {
+        scrollableTabs.show();
         scrollableTabs.has().values(equalTo(asList("ITEM ONE", "ITEM TWO", "ITEM THREE", "ITEM FOUR", "ITEM FIVE",
                 "ITEM SIX", "ITEM SEVEN", "ITEM EIGHT", "ITEM NINE", "ITEM TEN", "ITEM ELEVEN")));
         scrollableTabs.select(1);
diff --git a/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/elements/inputs/MUIButton.java b/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/elements/inputs/MUIButton.java
index 81c43f0768..a87b29538b 100644
--- a/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/elements/inputs/MUIButton.java
+++ b/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/elements/inputs/MUIButton.java
@@ -45,4 +45,14 @@ public String imageLocator() {
     public Typography typography() {
         return new Typography().setCore(Typography.class, core().find(".MuiTypography-root"));
     }
+
+    @Override
+    public boolean isDisabled() {
+        return core().hasClass("Mui-disabled");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return !this.isDisabled();
+    }
 }