diff --git a/javascripts/tabs.js b/javascripts/tabs.js
index d1cd31e..9e9fdd2 100644
--- a/javascripts/tabs.js
+++ b/javascripts/tabs.js
@@ -74,13 +74,15 @@
 			}    		
 
         });
+
+        var activeClass = this.options.activeClass;
         
         $(tabs).click(function() {
         	var controls = $(this).attr('aria-controls');
-			$(this).siblings().attr('aria-selected', 'false').removeClass(this.options.activeClass);
-			$(this).attr('aria-selected', 'true').addClass(this.options.activeClass);
-			$(tabPanels).attr('aria-hidden', 'true').css('display', 'none').removeClass(this.options.activeClass);
-			$(tabPanels).filter('#' + controls).attr('aria-hidden', 'false').css('display', 'block').addClass(this.options.activeClass);
+			$(this).siblings().attr('aria-selected', 'false').removeClass(activeClass);
+			$(this).attr('aria-selected', 'true').addClass(activeClass);
+			$(tabPanels).attr('aria-hidden', 'true').css('display', 'none').removeClass(activeClass);
+			$(tabPanels).filter('#' + controls).attr('aria-hidden', 'false').css('display', 'block').addClass(activeClass);
 		});        
         
     };
diff --git a/javascripts/tests/tests.js b/javascripts/tests/tests.js
index 7565c3f..0203ff7 100644
--- a/javascripts/tests/tests.js
+++ b/javascripts/tests/tests.js
@@ -225,4 +225,27 @@ $(document).ready(function () {
 
     });
 
+    test("Initialization should set display correctly", function () {
+
+        var tabContainer = $('#qunit-fixture #tab-container');
+        var tabList = $(tabContainer).find('> ul');
+        var tabPanels = $(tabContainer).children().not('ul');
+        var tabs = tabList.find('li');
+        tabContainer.skeletonTabs();
+
+        $(tabPanels).each(function(index) {
+            if(index != 0){
+                
+                ok($(this).is(':hidden'),
+                'Expect tabpanel at position ' + index + ' to be hidden');
+                   
+            }else{
+                
+                ok($(this).not(':hidden'),
+                'Expect tabpanel at position ' + index + ' to not be hidden'); 
+            }         
+        });
+
+    });
+
 });
\ No newline at end of file