diff --git a/features/homepage.feature b/features/homepage.feature
index 777070aa..5cbe43cf 100644
--- a/features/homepage.feature
+++ b/features/homepage.feature
@@ -5,4 +5,7 @@ Feature: Homepage
 
   Scenario:
     Given I am on "/"
-    Then I should see "I’m a Web Developer and System Administrator based in Wales, UK."
+    Then the response status code should be 200
+    And I should see "I’m a Web Developer and System Administrator based in Wales, UK."
+    And the "title" element should contain "Web Developer, System Administrator - PHP, Drupal, Symfony, Linux | Oliver Davies"
+    And the "title" element should not contain "About | Oliver Davies"
diff --git a/source/_includes/title.twig b/source/_includes/title.twig
index 6e2926ea..90021f41 100644
--- a/source/_includes/title.twig
+++ b/source/_includes/title.twig
@@ -1,5 +1,5 @@
 {% spaceless %}<title>
-    {% if page.front %}
+    {% if page.url == '/.' %}
         {{ site.subtitle }} | {{ site.title }}
     {% else %}
         {{ page.title }} | {{ site.title }}