diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html
index 53b9b8b1f..7a2d5859f 100644
--- a/sphinx/themes/basic/layout.html
+++ b/sphinx/themes/basic/layout.html
@@ -152,8 +152,8 @@
{%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
-{%- block document %}
+{%- block document %}
{%- if not embedded %}{% if not theme_nosidebar|tobool %}
@@ -165,10 +165,11 @@
{%- endif %}{% endif %}
- {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
+{%- endblock %}
+
+{%- block sidebar2 %}{{ sidebar() }}{% endblock %}
-{%- endblock %}
{%- block relbar2 %}{{ relbar() }}{% endblock %}