diff --git a/templates/base.html b/templates/base.html
index 4be7624..593ef0f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -48,7 +48,7 @@
       <span class="navbar-text">
             {% if user.is_authenticated %}
             Logged in as: {{ user.username }}
-            <a href="logout">logout</a>
+            <a href="logout?next={{ request.get_full_path|urlencode }}">logout</a>
             {% else %}
             {% is_auth_method "GitHub" as is_github %}
             {% if is_github %}
diff --git a/templates/rest_framework/api.html b/templates/rest_framework/api.html
index 86d2dd6..2de5231 100644
--- a/templates/rest_framework/api.html
+++ b/templates/rest_framework/api.html
@@ -23,7 +23,7 @@
 <span class="navbar-text">
   {% if user.is_authenticated %}
   Logged in as: {{ user.username }}
-  <a href="logout">logout</a>
+  <a href="logout?next={{ request.get_full_path|urlencode }}">logout</a>
   {% else %}
   {% is_auth_method "GitHub" as is_github %}
   {% if is_github %}