diff --git a/core/templates/timer_nav.html b/core/templates/timer_nav.html
index c8fca219..26ffd44c 100644
--- a/core/templates/timer_nav.html
+++ b/core/templates/timer_nav.html
@@ -6,7 +6,7 @@
        aria-expanded="false"><i class="fa fa-clock-o" aria-hidden="true"></i> Timers</a>
     <div class="dropdown-menu" aria-labelledby="timer-dropdown-menu-link">
         {% if perms.core.add_timer %}
-            <a class="dropdown-item" href="{% url 'timer-add-quick' %}?next={{ next }}">
+            <a class="dropdown-item" href="{% url 'timer-add-quick' %}">
                 <i class="fa fa-plus" aria-hidden="true"></i> Create Timer
             </a>
             {% if timers %}
diff --git a/core/templatetags/timers.py b/core/templatetags/timers.py
index 84786e0f..709291b6 100644
--- a/core/templatetags/timers.py
+++ b/core/templatetags/timers.py
@@ -21,6 +21,7 @@ def timer_nav(context, active=True):
     request = context['request'] or None
     timers = Timer.objects.filter(user=request.user, active=active)
     perms = context['perms'] or None
+    # The 'next' parameter is currently not used.
     return {'timers': timers, 'perms': perms, 'next': request.path}
 
 
diff --git a/core/views.py b/core/views.py
index 6f81c74b..80e748e2 100644
--- a/core/views.py
+++ b/core/views.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from django.core.urlresolvers import resolve
 from django.contrib.auth.mixins import (LoginRequiredMixin,
                                         PermissionRequiredMixin)
+from django.urls import reverse
 from django.views.generic.base import TemplateView, RedirectView
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
@@ -185,7 +186,8 @@ class TimerAddQuick(PermissionRequiredMixin, RedirectView):
     def get(self, request, *args, **kwargs):
         instance = Timer.objects.create(user=request.user)
         instance.save()
-        self.url = request.GET.get('next', '/')
+        self.url = request.GET.get(
+            'next', reverse('timer-detail', args={instance.id}))
         return super(TimerAddQuick, self).get(request, *args, **kwargs)