diff --git a/manage.py b/manage.py
index 62c4bbd..8a6e280 100755
--- a/manage.py
+++ b/manage.py
@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'whispermaphone.settings')
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "whispermaphone.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
diff --git a/thoughts/templates/thoughts/index.html b/thoughts/templates/thoughts/index.html
index 05953ec..029021d 100644
--- a/thoughts/templates/thoughts/index.html
+++ b/thoughts/templates/thoughts/index.html
@@ -12,6 +12,11 @@
 
 {% block head %}
 <link rel="alternate" href="/feed" type="application/rss+xml" title="RSS">
+{% if not first_page %}
+    <link rel="canonical" href="/?page={{ current_page_slug }}">
+{% else %}
+    <link rel="canonical" href="/">
+{% endif %}
 
 <link href="{% static 'thoughts/codehighlight.css' %}" rel="stylesheet">
 {% endblock %}
@@ -21,7 +26,7 @@
         <nav class="history-nav top" aria-label="History Navigation">
             <ul>
             {% for page in pages %}
-                {% if page.slug == current_page %}
+                {% if page.slug == current_page_slug %}
                     <li><span class="current-page">{{ page.formatted_name }}</span></li>
                 {% else %}
                     <li><a href="?page={{ page.slug }}">{{ page.formatted_name }}</a></li>
@@ -91,7 +96,7 @@
     <nav class="history-nav bottom" aria-label="History Navigation">
         <ul>
         {% for page in pages %}
-            {% if page.slug == current_page %}
+            {% if page.slug == current_page_slug %}
                 <li><span class="current-page">{{ page.formatted_name }}</span></li>
             {% else %}
                 <li><a href="?page={{ page.slug }}">{{ page.formatted_name }}</a></li>
diff --git a/thoughts/views.py b/thoughts/views.py
index 507f4c6..f5821cf 100644
--- a/thoughts/views.py
+++ b/thoughts/views.py
@@ -35,12 +35,10 @@ def index(request):
     except ValueError:
         highlighted_uuid = ""
 
-    # Figure out what page we're viewing
+    ## Figure out what page we're viewing
     pages = get_all_pages()
 
-    # First item in pages should be listed first
-    requested_page = pages[0]
-    requested_slug = request.GET.get("page", default=requested_page.slug)
+    requested_slug = request.GET.get("page", default="")
 
     # show=uuid takes priority over page
     if highlighted_uuid:
@@ -50,10 +48,16 @@ def index(request):
         except Thought.DoesNotExist:
             pass
 
-    if requested_page.slug != requested_slug:
-        for p in pages:
-            if p.slug == requested_slug:
-                requested_page = p
+    # When we get here, either:
+    #   no slug was passed, requested_slug is ""
+    #   a valid highlighted_uuid was passed, requested_slug is the slug of that page
+    #   requested_slug is an invalid slug
+    #   requested_slug is a valid slug
+    # First item in pages should be listed first
+    requested_page = pages[0]
+    for p in pages:
+        if p.slug == requested_slug:
+            requested_page = p
 
     thoughts = requested_page.get_all_entries()
 
@@ -62,7 +66,7 @@ def index(request):
         "highlighted": highlighted_uuid,
         "authenticated": authenticated,
         "pages": pages,
-        "current_page": requested_slug,
+        "current_page_slug": requested_page.slug,
         "first_page": requested_page == pages[0] # if you're viewing the first page
     })