diff --git a/aircox/templates/aircox/program_form.html b/aircox/templates/aircox/program_form.html
index a11bb3d..6f43a5c 100644
--- a/aircox/templates/aircox/program_form.html
+++ b/aircox/templates/aircox/program_form.html
@@ -8,7 +8,7 @@
 
 {% block page-form-actions %}
 <a class="button secondary withmargin" href="{% url 'episode-list' parent_slug=object.slug %}">{% trans "Episodes" %}</a>
-<a class="button secondary withmargin" href="{% url 'program-add-episode' object.pk %}">{% trans "New episode" %}</a>
+<a class="button secondary withmargin" href="{% url 'program-add-episode' object.pk %}" target="_self">{% trans "New episode" %}</a>
 {% if object and object.pk and request.user.is_superuser %}
 <button type="button"
     class="button secondary withmargin"
diff --git a/aircox/views/episode.py b/aircox/views/episode.py
index f9d2dfc..31377d1 100644
--- a/aircox/views/episode.py
+++ b/aircox/views/episode.py
@@ -1,7 +1,9 @@
 from django.contrib.auth.mixins import UserPassesTestMixin
+from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from django.views.generic.base import View
 
 from aircox.models import Episode, Program, StaticPage, Track
 from aircox import forms, filters, permissions
@@ -144,7 +146,15 @@ class EpisodeUpdateView(UserPassesTestMixin, VueFormDataMixin, PageUpdateView):
         return resp
 
 
-class EpisodeCreateView(EpisodeUpdateView):
+class EpisodeCreateView(UserPassesTestMixin, View):
+    def get(self, request, **kwargs):
+        program = self.get_object()
+        episode = Episode.objects.create(program=program, title="%s (%s)" % (program.title, _("draft")))
+        return HttpResponseRedirect(reverse("episode-edit", kwargs={"pk": episode.pk}))
+
+    def test_func(self):
+        program = self.get_object()
+        return permissions.program.can(self.request.user, "update", program)
+
     def get_object(self):
-        program = get_object_or_404(Program, pk=self.kwargs["pk"])
-        return Episode.objects.create(program=program, title="%s (%s)" % (program.title, _("draft")))
+        return get_object_or_404(Program, pk=self.kwargs["pk"])