diff --git a/docs/_static/css/toggle.css b/docs/_static/css/toggle.css
index ebbd0658a..add134f6c 100644
--- a/docs/_static/css/toggle.css
+++ b/docs/_static/css/toggle.css
@@ -74,4 +74,10 @@ html.transition *:before,
 html.transition *:after {
     transition: ease-in-out 200ms !important;
     transition-delay: 0 !important;
-}
\ No newline at end of file
+}
+
+nav.wy-nav-side {
+    /* The default padding of 2em is too small and the "Keyword Index" link gets obscured
+     * by the version toggle. */
+    padding-bottom: 3em;
+}
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 41713a109..498c0e6e9 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -2,5 +2,9 @@
 
 {% block menu %}
     {{ super() }}
-    <a href="{{ pathto('genindex') }}">Keyword Index</a>
+    <ul>
+        <li>
+            <a href="{{ pathto('genindex') }}">Keyword Index</a>
+        </li>
+    </ul>
 {% endblock %}