diff --git a/docs/en_US/_templates/layout.html b/docs/en_US/_templates/layout.html
index 7ee15d7864..1c8995d0ae 100644
--- a/docs/en_US/_templates/layout.html
+++ b/docs/en_US/_templates/layout.html
@@ -1,7 +1,29 @@
-{% extends "!layout.html" %}
+{% block sidebartitle %}
+
+      {% if logo and theme_logo_only %}
+        <a href="{{ pathto('index') }}">
+      {% else %}
+        <a href="{{ pathto('index') }}" class="icon icon-home"> {{ project }}
+      {% endif %}
+
+      {% if logo %}
+        {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
+        <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
+      {% endif %}
+      </a>
+
+      {% if theme_display_version %}
+        {%- set nav_version = version %}
+        {% if READTHEDOCS and current_version %}
+          {%- set nav_version = current_version %}
+        {% endif %}
+        {% if nav_version %}
+          <div class="version">
+            {{ nav_version }}
+          </div>
+        {% endif %}
+      {% endif %}
+
+      {% include "searchbox.html" %}
 
-{% block sidebarlogo %}
-<a href="{{ pathto('index') }}">
-    {%- if logo %}<img src="{{ pathto('_static/' + logo, 1) }}">{%- endif %}
-</a>
 {% endblock %}
\ No newline at end of file