diff --git a/courses/templates/subject/form_view_student.html b/courses/templates/subject/form_view_student.html
index 824972b..c21da8d 100644
--- a/courses/templates/subject/form_view_student.html
+++ b/courses/templates/subject/form_view_student.html
@@ -1,13 +1,17 @@
 {% load i18n %}
 
 <div class="panel panel-default">
+  <a href="{% url 'course:view_topic' topic.slug %}">
   <div class="panel-heading">
     <div class="row">
       <div class="col-md-9 col-sm-9">
         <h3>{{topic}}</h3>
       </div>
     </div>
+    </div>
+  </a>
   </div>
+  
   <div class="panel-body">
     <p>{{topic.description|linebreaks}}</p>
   </div>
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index fcb6f57..2054acf 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 
 <div class="panel panel-default">
+  <a href="{% url 'course:view_topic' topic.slug %}">
   <div class="panel-heading">
     <div class="row">
       <div class="col-md-9 col-sm-9">
@@ -11,6 +12,7 @@
       </div>
     </div>
   </div>
+  </a>
   <div class="panel-body">
     <p>{{topic.description|linebreaks}}</p>
   </div>
--
libgit2 0.21.2