diff --git a/src/tabs/tabs.js b/src/tabs/tabs.js
index 710959759a..64f070fdc3 100644
--- a/src/tabs/tabs.js
+++ b/src/tabs/tabs.js
@@ -95,6 +95,7 @@ angular.module('ui.bootstrap.tabs', [])
     link: function(scope, element, attrs) {
       scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical) : false;
       scope.justified = angular.isDefined(attrs.justified) ? scope.$parent.$eval(attrs.justified) : false;
+      scope.hideTabs = angular.isDefined(attrs.hideTabs) ? scope.$parent.$eval(attrs.hideTabs) : false;
     }
   };
 })
diff --git a/template/tabs/tabset.html b/template/tabs/tabset.html
index b953a49161..7756b4be43 100644
--- a/template/tabs/tabset.html
+++ b/template/tabs/tabset.html
@@ -2,7 +2,8 @@
   <ul class="nav nav-{{type || 'tabs'}}" ng-class="{'nav-stacked': vertical, 'nav-justified': justified}" ng-transclude></ul>
   <div class="tab-content">
     <div class="tab-pane" 
-         ng-repeat="tab in tabs" 
+         ng-repeat="tab in tabs"
+         ng-if="tab.active || !hideTabs"
          ng-class="{active: tab.active}"
          tab-content-transclude="tab">
     </div>