diff --git a/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/TabListItem.java b/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/TabListItem.java
index <HASH>..<HASH> 100644
--- a/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/TabListItem.java
+++ b/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/TabListItem.java
@@ -89,6 +89,18 @@ public class TabListItem extends ListItem implements HasHTML, HasTarget {
     }
 
     @Override
+    public void setEnabled(final boolean enabled) {
+        super.setEnabled(enabled);
+
+        // On enable/disable we need to add/remove the data toggle for it to work properly
+        if (enabled) {
+            setToggle(Toggle.TAB);
+        } else {
+            setToggle(null);
+        }
+    }
+
+    @Override
     protected void onLoad() {
         super.onLoad();
Updating the TabListItem to allow for proper setEnable(true/false), with tabs you must remove the data-toggle="tab" to properly disable it and add it back when enabling it.