diff --git a/sphinx/themes/basic/genindex-single.html b/sphinx/themes/basic/genindex-single.html
index 5ca9c2736..1e98ba9c9 100644
--- a/sphinx/themes/basic/genindex-single.html
+++ b/sphinx/themes/basic/genindex-single.html
@@ -13,33 +13,26 @@
 
    <h1 id="index">{% trans key=key %}Index &ndash; {{ key }}{% endtrans %}</h1>
 
-<table width="100%" class="indextable"><tr><td width="33%" valign="top">
-<dl>
-{%- set breakat = count // 2 %}
-{%- set numcols = 1 %}
-{%- set numitems = 0 %}
-{% for entryname, (links, subitems) in entries %}
-<dt>{%- if links -%}<a href="{{ links[0] }}">{{ entryname|e }}</a>
-  {%- for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%}
-  {%- else -%}
-{{ entryname|e }}
-  {%- endif -%}</dt>
-  {%- if subitems %}
-  <dd><dl>
+<table width="100%" class="indextable"><tr>
+  {%- for column in entries|slice(2) if column %}
+  <td width="33%" valign="top"><dl>
+  {%- for entryname, (links, subitems) in column %}
+    <dt>{% if links %}<a href="{{ links[0] }}">{{ entryname|e }}</a>
+      {%- for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor %}
+      {%- else %}{{ entryname|e }}{% endif %}</dt>
+    {%- if subitems %}
+    <dd><dl>
     {%- for subentryname, subentrylinks in subitems %}
-    <dt><a href="{{ subentrylinks[0] }}">{{ subentryname|e }}</a>
-    {%- for link in subentrylinks[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%}
-    </dt>
+      <dt><a href="{{ subentrylinks[0] }}">{{ subentryname|e }}</a>
+      {%- for link in subentrylinks[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%}
+      </dt>
     {%- endfor %}
   </dl></dd>
   {%- endif -%}
-{%- set numitems = numitems + 1 + (subitems|length) -%}
-{%- if numcols < 2 and numitems > breakat -%}
-{%- set numcols = numcols+1 -%}
-</dl></td><td width="33%" valign="top"><dl>
-{%- endif -%}
 {%- endfor %}
-</dl></td></tr></table>
+</dl></td>
+{%- endfor %}
+</tr></table>
 
 {% endblock %}
 
diff --git a/sphinx/themes/basic/genindex-split.html b/sphinx/themes/basic/genindex-split.html
index c33bda865..d068a96a6 100644
--- a/sphinx/themes/basic/genindex-split.html
+++ b/sphinx/themes/basic/genindex-split.html
@@ -15,6 +15,7 @@
 
    <p>{{ _('Index pages by letter') }}:</p>
 
+   <div class="genindex-jumpbox">
    <p>{% for key, dummy in genindexentries -%}
    <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a>
      {% if not loop.last %}| {% endif %}
@@ -22,6 +23,7 @@
 
    <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong>
                                                ({{ _('can be huge') }})</a></p>
+   </div>
 
 {% endblock %}
 
diff --git a/sphinx/themes/basic/genindex.html b/sphinx/themes/basic/genindex.html
index ba335fe43..4d46380f1 100644
--- a/sphinx/themes/basic/genindex.html
+++ b/sphinx/themes/basic/genindex.html
@@ -19,8 +19,6 @@
    {%- endfor %}
    </div>
 
-   <hr />
-
    {%- for key, entries in genindexentries %}
 <h2 id="{{ key }}">{{ key }}</h2>
 <table width="100%" class="indextable genindextable"><tr>
@@ -28,7 +26,7 @@
   <td width="33%" valign="top"><dl>
   {%- for entryname, (links, subitems) in column %}
     <dt>{% if links %}<a href="{{ links[0] }}">{{ entryname|e }}</a>
-      {% for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor %}
+      {%- for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor %}
       {%- else %}{{ entryname|e }}{% endif %}</dt>
     {%- if subitems %}
     <dd><dl>