diff --git a/_layouts/default.html b/_layouts/default.html
index 8d6f134075..40f17908e1 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -23,8 +23,12 @@
-
{{ page.title | default: "Godot Engine" }}
-
+ {% if page.title %}
+ {{ page.title | remove: " - Godot Engine" }}{% if page.notitlesuffix != true %} – Godot Engine{% endif %}
+ {% else %}
+ Godot Engine
+ {% endif %}
+
diff --git a/pages/community/community.html b/pages/community/community.html
index d3c2f69d57..3ef3b4a6c2 100644
--- a/pages/community/community.html
+++ b/pages/community/community.html
@@ -1,6 +1,6 @@
---
permalink: /community/index.html
-title: Godot Engine - Community
+title: Community
layout: default
---
diff --git a/pages/education.html b/pages/education.html
index 153409f275..8938611077 100644
--- a/pages/education.html
+++ b/pages/education.html
@@ -1,4 +1,5 @@
---
+title: Education
permalink: /education/index.html
layout: default
---
diff --git a/pages/home.html b/pages/home.html
index a5505ee9ef..eba34b2c0e 100644
--- a/pages/home.html
+++ b/pages/home.html
@@ -1,6 +1,7 @@
---
permalink: /
title: "Godot Engine - Free and open source 2D and 3D game engine"
+notitlesuffix: true
description: "Godot provides a huge set of common tools, so you can just focus on making your game without reinventing
the wheel."
layout: default