diff --git a/templates/macros.html b/templates/macros.html
index 8d5e6a4cf79614ed7cdd8a1934751b606d31fb53..20465670aed6c878d3cbf5c8f1c7578e320a624c 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -65,7 +65,6 @@
 {% macro course_list_item(course,show_semester=False) %}
 <li class="list-group-item list-group-item-condensed {% if (not course.visible) or (not course.listed) %}list-group-item-danger{% endif %}">
 	<div class="row">
-		<a href="{{url_for('course', handle=course.handle)}}">
 			{% if show_semester %}
 				<span class="col-xs-2 col-md-1">
 					{{ course.semester }}
@@ -74,7 +73,9 @@
 			{% else %}
 				<span class="col-xs-12 col-md-7">
 			{% endif %}
+				<a href="{{url_for('course', handle=course.handle)}}">
 				{{ course.title }}
+				</a>
 			</span>
 			<span class="col-xs-8 col-md-3">
 				{{ course.organizer }}
@@ -82,7 +83,6 @@
 			<span class="col-xs-4 col-md-2">
 				{{ course.subject }}
 			</span>
-		</a>
 	</div>
 </li>
 {% endmacro %}