diff --git a/docs/dev-guide/themes.md b/docs/dev-guide/themes.md
index 35950522..e147169f 100644
--- a/docs/dev-guide/themes.md
+++ b/docs/dev-guide/themes.md
@@ -86,7 +86,7 @@ The simplest `main.html` file is the following:
- {{ page.content_title }} - {{ config.site_name }}
+ {% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}
{%- for path in config.extra_css %}
{%- endfor %}
@@ -458,7 +458,7 @@ object to alter the behavior. For example, to display a different title
on the homepage:
```django
-{% if not page.is_homepage %}{{ page.content_title }} - {% endif %}{{ site_name }}<title>
+<title>{% if not page.is_homepage %}{{ page.title }} - {% endif %}{{ site_name }}
```
::: mkdocs.structure.pages.Page.previous_page
diff --git a/mkdocs/themes/mkdocs/base.html b/mkdocs/themes/mkdocs/base.html
index 4f6cb089..2b077bd0 100644
--- a/mkdocs/themes/mkdocs/base.html
+++ b/mkdocs/themes/mkdocs/base.html
@@ -13,7 +13,7 @@
{%- endblock %}
{%- block htmltitle %}
- {% if page and not page.is_homepage %}{{ page.content_title }} - {% endif %}{{ config.site_name }}
+ {% if page and page.title and not page.is_homepage %}{{ page.title }} - {% endif %}{{ config.site_name }}
{%- endblock %}
{%- block styles %}
diff --git a/mkdocs/themes/readthedocs/base.html b/mkdocs/themes/readthedocs/base.html
index c8a61357..4265d4a2 100644
--- a/mkdocs/themes/readthedocs/base.html
+++ b/mkdocs/themes/readthedocs/base.html
@@ -16,7 +16,7 @@
{%- endblock %}
{%- block htmltitle %}
- {% if page and not page.is_homepage %}{{ page.content_title }} - {% endif %}{{ config.site_name }}
+ {% if page and page.title and not page.is_homepage %}{{ page.title }} - {% endif %}{{ config.site_name }}
{%- endblock %}
{%- block styles %}