diff --git a/incorporealcms/pages.py b/incorporealcms/pages.py
index b426f7e..27c6182 100644
--- a/incorporealcms/pages.py
+++ b/incorporealcms/pages.py
@@ -44,8 +44,9 @@ def display_page(path):
parent_navs = generate_parent_navs(resolved_path)
- page_title = (get_meta_str(md, 'title') if md.Meta.get('title') else
- f'/{instance_resource_path_to_request_path(resolved_path)}')
+ page_name = (get_meta_str(md, 'title') if md.Meta.get('title') else
+ f'/{instance_resource_path_to_request_path(resolved_path)}')
+ page_title = f'{page_name} - {app.config["TITLE_SUFFIX"]}' if page_name else app.config['TITLE_SUFFIX']
logger.debug("title (potentially derived): %s", page_title)
return render('base.html', title=page_title, description=get_meta_str(md, 'description'),
diff --git a/incorporealcms/templates/base.html b/incorporealcms/templates/base.html
index b19814f..d2772ab 100644
--- a/incorporealcms/templates/base.html
+++ b/incorporealcms/templates/base.html
@@ -1,6 +1,6 @@
-
{{ title }}{% if title %} - {% endif %}{{ config.TITLE_SUFFIX }}
+{{ title }}
{% if title %}{% endif %}
{% if description %}{% endif %}
{% if image %}{% endif %}
diff --git a/tests/functional_tests.py b/tests/functional_tests.py
index 47de777..bb6ef20 100644
--- a/tests/functional_tests.py
+++ b/tests/functional_tests.py
@@ -52,7 +52,7 @@ def test_page_with_card_metadata(client):
"""Test that a page with opengraph metadata."""
response = client.get('/more-metadata')
assert response.status_code == 200
- assert b'' in response.data
+ assert b'' in response.data
assert b'' in response.data
assert b'' in response.data
@@ -61,11 +61,18 @@ def test_page_with_card_title_even_when_no_metadata(client):
"""Test that a page without metadata still has a card with the derived title."""
response = client.get('/no-title')
assert response.status_code == 200
- assert b'' in response.data
+ assert b'' in response.data
assert b'incorporeal.org' in response.data
+
+
def test_page_has_modified_timestamp(client):
"""Test that pages have modified timestamps in them."""
response = client.get('/')
diff --git a/tests/instance/pages/forced-no-title.md b/tests/instance/pages/forced-no-title.md
new file mode 100644
index 0000000..9db5b4a
--- /dev/null
+++ b/tests/instance/pages/forced-no-title.md
@@ -0,0 +1,3 @@
+Title:
+
+some words are here