diff --git a/basetheme_bootstrap/static/js/basetheme_bootstrap.js b/basetheme_bootstrap/static/js/basetheme_bootstrap.js
index d5927076e5810912a2ccfa617e6bdb1583c19230..3b1abe706c8070511ae5857d6810782f452f8ae8 100644
--- a/basetheme_bootstrap/static/js/basetheme_bootstrap.js
+++ b/basetheme_bootstrap/static/js/basetheme_bootstrap.js
@@ -98,3 +98,10 @@ $(window).on("scroll", function() {
     $("header").removeClass("scrolled");
   }
 });
+
+$(document).ready(function(){
+    let url = document.location.toString();
+    if ( url.match('#') ) {
+        $('.nav-tabs a.nav-item[href="#'+url.split('#')[1] + '"]').tab('show');
+    }
+});
diff --git a/setup.py b/setup.py
index f736322f62ec8b37e7ee3de593237d7eaecc2fb7..2498232a82f6a8b547e42af7dfc445eb068e43ac 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
 
 setup(
     name='django-basetheme-bootstrap',
-    version='0.2.35',
+    version='0.2.36',
     description='Django Basetheme Bootstrap',
     long_description=readme,
     author='Bryan Brancotte',