diff -r 682a8e36dd18 Doc/conf.py
--- a/Doc/conf.py	Tue Jul 05 17:08:52 2016 +0300
+++ b/Doc/conf.py	Wed Jul 06 16:26:37 2016 -0700
@@ -60,7 +60,11 @@
 
 # Custom sidebar templates, filenames relative to this file.
 html_sidebars = {
-    'index': 'indexsidebar.html',
+    # Defaults taken from http://www.sphinx-doc.org/en/stable/config.html#confval-html_sidebars
+    # Re-arranged so that searchbox is first.
+    '**': ['searchbox.html', 'localtoc.html', 'relations.html', 'sourcelink.html'],
+    # Searchbox first on index page for consistency
+    'index': ['searchbox.html', 'indexsidebar.html'],
 }
 
 # Additional templates that should be rendered to pages.