diff --git a/apps/course/views.py b/apps/course/views.py
index 01bdfd09..75ff396a 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -146,8 +146,11 @@ class CourseEditView(TemplateView):
     template_name = 'course/course_edit.html'
 
     def get(self, request, pk=None):
+        drafts = Course.objects.filter(author=request.user, status=Course.DRAFT)
         if pk:
             self.object = get_object_or_404(Course, pk=pk)
+        elif drafts.exists():
+            self.object = drafts.last()
         else:
             self.object = None
         return super().get(request)