diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html
index 04339663..6bd03bbc 100644
--- a/apps/course/templates/course/course.html
+++ b/apps/course/templates/course/course.html
@@ -242,14 +242,14 @@
       <div class="lessons__list">
         {% for lesson in course.lessons.all %}
         {% if request.user.role == request.user.AUTHOR_ROLE or request.user.role == request.user.ADMIN_ROLE %}
-        <a href="{% url 'lesson' pk=lesson.id %}">
+        <a href="{% url 'lesson' pk=lesson.id %}?next={{ request.get_full_path }}">
         {% else %}
         <div>
         {% endif %}
           <div class="lessons__item">
             <div class="lessons__subtitle subtitle">{{ lesson.title }}</div>
             <div class="lessons__row">
-              {% if lesson.cover %}
+              {% comment %} {% if lesson.cover %}
               <div class="lessons__preview">
                 <img class="lessons__pic" src="{{ lesson.cover.url }}">
               </div>
@@ -257,7 +257,7 @@
               <div class="lessons__preview">
                 <img class="lessons__pic" src="{% static 'img/pic-3.jpg' %}">
               </div>
-              {% endif %}
+              {% endif %} {% endcomment %}
               <div class="lessons__content">{{ lesson.short_description | safe }}</div>
             </div>
           </div>
diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html
index 09ba9168..9286f106 100644
--- a/apps/course/templates/course/lesson.html
+++ b/apps/course/templates/course/lesson.html
@@ -6,7 +6,7 @@
 <div class="section">
   <div class="section__center center center_sm">
     <div class="go">
-      <a class="go__item" href="{% url 'course' lesson.course.id %}">
+      <a class="go__item" href="{% if next %}{{next}}{% else %}{% url 'course' lesson.course.id %}{% endif %}">
         <div class="go__arrow">
           <svg class="icon icon-arrow-left">
             <use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-left"></use>
@@ -14,7 +14,8 @@
         </div>
         <div class="go__title">Вернуться к&nbsp;списку уроков</div>
       </a>
-      <a class="go__item" href="#">
+      {% comment %} {% if next_lesson %}
+      <a class="go__item" href="{{ next_lesson }}">
         <div class="go__title">Перейти к&nbsp;следующему уроку</div>
         <div class="go__arrow">
           <svg class="icon icon-arrow-right">
@@ -22,20 +23,21 @@
           </svg>
         </div>
       </a>
+      {% endif %} {% endcomment %}
     </div>
     <div class="lesson">
       <div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
       <div class="lesson__content">{{ lesson.short_description }}</div>
-      <a class="lesson__video video" href="#">
+      {% comment %} <a class="lesson__video video" href="#">
         {% if lesson.cover %}
         <img class="video__pic" src="{{ lesson.cover.image.url }}"/>
         {% else %}
         <img class="video__pic" src="{% static 'img/no_cover.png' %}"/>
         {% endif %} 
-        {% comment %} <svg class="icon icon-play">
+        <svg class="icon icon-play">
           <use xlink:href="{% static 'img/sprite.svg' %}#icon-play"></use>
-        </svg> {% endcomment %}
-      </a>
+        </svg>
+      </a> {% endcomment %}
     </div>
   </div>
 </div>
diff --git a/apps/course/views.py b/apps/course/views.py
index f0cf1c57..3bab031a 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -264,6 +264,12 @@ class LessonView(DetailView):
             raise Http404
         return response
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['next'] = self.request.GET.get('next', None)
+        context['next_lesson'] = self.request.GET.get('next_lesson', None)
+        return context
+
 
 class SearchView(CoursesView):
     template_name = 'course/result.html'