diff --git a/docs_theme/base.html b/docs_theme/base.html
index 46992f5df..4e95f1f95 100644
--- a/docs_theme/base.html
+++ b/docs_theme/base.html
@@ -151,10 +151,10 @@
   <script src="{{ base_url }}/js/theme.js"></script>
 
   <script>
-    //$('.side-nav').scrollspy()
     var shiftWindow = function() {
       scrollBy(0, -50)
     };
+
     if (location.hash) shiftWindow();
     window.addEventListener("hashchange", shiftWindow);
 
@@ -162,12 +162,12 @@
       event.stopPropagation();
     });
 
-    // Dynamically force sidenav to no higher than browser window
-    $('.side-nav').css('max-height', window.innerHeight - 130);
+    // Dynamically force sidenav/dropdown to no higher than browser window
+    $('.side-nav, .dropdown-menu').css('max-height', window.innerHeight - 130);
 
     $(function() {
       $(window).resize(function() {
-        $('.side-nav').css('max-height', window.innerHeight - 130);
+        $('.side-nav, .dropdown-menu').css('max-height', window.innerHeight - 130);
       });
     });
   </script>
diff --git a/docs_theme/css/default.css b/docs_theme/css/default.css
index c3b9e0f16..fdb770071 100644
--- a/docs_theme/css/default.css
+++ b/docs_theme/css/default.css
@@ -5,11 +5,12 @@ pre {
 }
 
 .dropdown .dropdown-menu {
-    display: none;
+  display: none;
+  overflow-y: scroll;
 }
 
 .dropdown.open .dropdown-menu {
-    display: block;
+  display: block;
 }
 
 @media (max-width: 480px) {