diff --git a/jfoenix/src/main/java/com/jfoenix/skins/JFXTabPaneSkin.java b/jfoenix/src/main/java/com/jfoenix/skins/JFXTabPaneSkin.java
index d6d8d1e8..f3c77870 100644
--- a/jfoenix/src/main/java/com/jfoenix/skins/JFXTabPaneSkin.java
+++ b/jfoenix/src/main/java/com/jfoenix/skins/JFXTabPaneSkin.java
@@ -1056,10 +1056,9 @@ private void updateSkinnableUI(){
         }
 
         private boolean showCloseButton() {
-            return tab.isClosable() &&
-                   (getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.ALL_TABS));
-//                   ||
-//                    getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.SELECTED_TAB) && tab.isSelected());
+            boolean allTabsPolicy = getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.ALL_TABS);
+            boolean selectedTabPolicy = getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.SELECTED_TAB) && tab.isSelected();
+            return (tab.isClosable() && (allTabsPolicy || selectedTabPolicy));
         }
 
         private void removeListeners() {