diff --git a/simplewiki_base.html b/simplewiki_base.html
index 731f5be8d9..2770013771 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -2,8 +2,6 @@
 
 <%inherit file="main.html"/>
 
-<%block name="title"><title>${"wiki_title"}</title></%block>
-
 <%block name="headextra">
   <!-- <link rel="stylesheet" media="screen,print" href="/static/simplewiki/css/base.css" /> -->
   <!-- <link rel="stylesheet" media="print" href="/static/simplewiki/css/base_print.css" /> -->
diff --git a/simplewiki_create.html b/simplewiki_create.html
index 3d820310f6..65ecbff4aa 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -2,6 +2,8 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%block name="title"><title>Create Article - MITX 6.002 Wiki</title></%block>
+
 <%block name="wiki_page_title">
 Create article
 </%block>
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index 7ead7f4abc..30e2c6ecc0 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -2,6 +2,8 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
+
 <%block name="wiki_page_title">
 ${ wiki_article.title }
 </%block>
diff --git a/simplewiki_error.html b/simplewiki_error.html
index 5f9bb0be5c..f4269f1043 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -6,6 +6,9 @@
     from django.core.urlresolvers import reverse
 %>
 
+<%block name="title"><title>Oops... - MITX 6.002 Wiki</title></%block>
+
+
 <%block name="wiki_page_title">
 Oops...
 </%block>
diff --git a/simplewiki_history.html b/simplewiki_history.html
index 0cdeaf4b30..bea5a02284 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -2,6 +2,8 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
+
 <%!
     from django.core.urlresolvers import reverse
 %>
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index 88b70c3b7e..267a1f921b 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -2,6 +2,8 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%block name="title"><title>Search Results - MITX 6.002 Wiki</title></%block>
+
 <%!
     from django.core.urlresolvers import reverse
 %>
diff --git a/simplewiki_view.html b/simplewiki_view.html
index 6492174670..05243b0bc1 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -2,6 +2,8 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
+
 <%block name="wiki_page_title">
   ${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}
 </%block>