diff --git a/lib/initfest/views/layouts/public/application.html.erb b/lib/initfest/views/layouts/public/application.html.erb
index dbd8cbe..1e4c4e7 100644
--- a/lib/initfest/views/layouts/public/application.html.erb
+++ b/lib/initfest/views/layouts/public/application.html.erb
@@ -3,9 +3,15 @@
   <head>
     <title>
       <% if content_for? :title %>
-        <%= yield :title %> |
+        <%= yield :title %>
+      <% end %>
+      <% if content_for?(:title) and current_conference? %>
+        <%= yield :title %> | <%= current_conference.try :title %>
+      <% elsif !content_for?(:title) and current_conference? %>
+        <%= current_conference.try :title %>
+      <% else %>
+        <%= yield :title %>
       <% end %>
-      <%= current_conference.try :title %>
     </title>
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
     <%= stylesheet_link_tag    "initfest/application", media: "all" %>
