diff --git a/app/controllers/asciicasts_controller.rb b/app/controllers/asciicasts_controller.rb
index 0f61582..6e35a51 100644
--- a/app/controllers/asciicasts_controller.rb
+++ b/app/controllers/asciicasts_controller.rb
@@ -15,6 +15,7 @@ class AsciicastsController < ApplicationController
   end
 
   def show
+    @title = @asciicast.smart_title
     respond_with @asciicast
   end
 
diff --git a/app/helpers/asciicasts_helper.rb b/app/helpers/asciicasts_helper.rb
index 1ad0ddd..ecdb47d 100644
--- a/app/helpers/asciicasts_helper.rb
+++ b/app/helpers/asciicasts_helper.rb
@@ -1,15 +1,5 @@
 module AsciicastsHelper
 
-  def asciicast_title(asciicast)
-    if asciicast.title.present?
-      asciicast.title
-    elsif asciicast.command.present?
-      "$ #{asciicast.command}"
-    else
-      "##{asciicast.id}"
-    end
-  end
-
   def profile_link(asciicast, options = {})
     if asciicast.user
       if options[:avatar]
diff --git a/app/models/asciicast.rb b/app/models/asciicast.rb
index eb8c35e..20aaacc 100644
--- a/app/models/asciicast.rb
+++ b/app/models/asciicast.rb
@@ -83,4 +83,14 @@ class Asciicast < ActiveRecord::Base
       end
     end
   end
+
+  def smart_title
+    if title.present?
+      title
+    elsif command.present?
+      "$ #{command}"
+    else
+      "##{id}"
+    end
+  end
 end
diff --git a/app/views/asciicasts/_preview.html.erb b/app/views/asciicasts/_preview.html.erb
index 4b9553c..f962fa2 100644
--- a/app/views/asciicasts/_preview.html.erb
+++ b/app/views/asciicasts/_preview.html.erb
@@ -1,6 +1,6 @@
 <li class="asciicast-preview">
   <h3>
-    <%= link_to asciicast_title(asciicast), asciicast %>
+    <%= link_to asciicast.smart_title, asciicast %>
 
     <span class="meta">
       <% if asciicast.user || asciicast.username %>
diff --git a/app/views/asciicasts/show.html.erb b/app/views/asciicasts/show.html.erb
index bb609fe..aa8046b 100644
--- a/app/views/asciicasts/show.html.erb
+++ b/app/views/asciicasts/show.html.erb
@@ -1,6 +1,6 @@
 <div class="page-header asciicast-heading">
   <h1>
-    <span class="title"><%= asciicast_title(@asciicast) %></span>
+    <span class="title"><%= @asciicast.smart_title %></span>
 
     <% if current_user && @asciicast.user == current_user %>
       <% if @asciicast.title.blank? %>
diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb
index da9253f..f604f83 100644
--- a/app/views/home/show.html.erb
+++ b/app/views/home/show.html.erb
@@ -36,7 +36,7 @@
   </p>
 
   <div class="featured-asciicast">
-    <h3><%= asciicast_title(@asciicast) %></h3>
+    <h3><%= @asciicast.smart_title %></h3>
 
     <%= render :partial => 'asciicasts/asciicast',
               :object => @asciicast,
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b047cdf..fa49d94 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>ascii.io</title>
+    <title><% if @title %><%= @title + " - "%><% end %>ascii.io</title>
     <%= airbrake_javascript_notifier %>
     <%= csrf_meta_tags %>
 
