diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2
index 1d00f152e563f748d61dfbfbee116a9479705ace..505c3fc044ed55fefe8a3062d92a36297442165b 100644
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@@ -1,8 +1,10 @@
 <html>
     <head>
-        <title>
-          Opaque - {% block title %}{% endblock %}
-        </title>
+        {% if title %}
+        <title>Opaque â€“ {{ title }}</title>
+        {% else %}
+        <title>Opaque</title>
+        {% endif %}
         <!-- import materialize icons css -->
         <link type="text/css" rel="stylesheet" href="{{ url_for('static', filename='fonts/material-design-icons-3.0.1/iconfont/material-icons.css') }}">
         <!--Import materialize.css-->
@@ -12,7 +14,7 @@
     </head>
     <body class="blue-grey lighten-5">
         {% block body %}
-        
+
         {% endblock %}
 
         <!--JavaScript at end of body for optimized loading-->