diff --git a/course/templates/course/_course_menu.html b/course/templates/course/_course_menu.html
index 0649608f9..8c70d1e72 100644
--- a/course/templates/course/_course_menu.html
+++ b/course/templates/course/_course_menu.html
@@ -7,6 +7,8 @@
 
 {% prepare_course_menu %}
 
+{% get_current_language as LANGUAGE_CODE %}
+
 <li>
 	<a href="#course-content" class="skip-link page-skip-link hidden-xs">
 		{% translate "SKIP_COURSE_NAVIGATION" %}
@@ -23,13 +25,15 @@ <h4 id="course-menu-heading">{% translate "LANGUAGE" %}</h4>
 		{% translate "CHANGE_LANGUAGE" %} <span class="caret"></span>
 	</a>
 	<ul class="dropdown-menu" aria-labelledby="lang-dropdown-mobile">
-		{% for language in instance.language|list_unselected %}
+		{% for language in instance.language|list_languages %}
 		<li role="none">
 			<form action="{{ instance|url:'set-enrollment-language' }}" method="post">
 				{% csrf_token %}
 				<input name="next" type="hidden" value="{{ request.get_full_path }}" />
 				<input name="language" type="hidden" value="{{ language }}" />
-				<button type="submit" class="btn">{{ language|language_name_local }}</button>
+				<button type="submit" class="btn" {% if LANGUAGE_CODE == language %}aria-current="true"{% endif %}>
+					{{ language|language_name_local }} {% if LANGUAGE_CODE == language %}<span class="glyphicon glyphicon-ok"></span>{% endif %}
+				</button>
 			</form>
 		</li>
 		{% endfor %}
@@ -47,13 +51,15 @@ <h4 id="course-menu-heading">{% translate "LANGUAGE" %}</h4>
 			<span>Language</span>
 		</button>
 		<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="lang-dropdown-desktop">
-			{% for language in instance.language|list_unselected %}
+			{% for language in instance.language|list_languages %}
 			<li>
 				<form action="{{ instance|url:'set-enrollment-language' }}" method="post">
 					{% csrf_token %}
 					<input name="next" type="hidden" value="{{ request.get_full_path }}" />
 					<input name="language" type="hidden" value="{{ language }}" />
-					<button type="submit" class="btn">{{ language|language_name_local }}</button>
+					<button type="submit" class="btn" {% if LANGUAGE_CODE == language %}aria-current="true"{% endif %}>
+						{{ language|language_name_local }} {% if LANGUAGE_CODE == language %}<span class="glyphicon glyphicon-ok"></span>{% endif %}
+					</button>
 				</form>
 			</li>
 			{% endfor %}
diff --git a/course/templatetags/course.py b/course/templatetags/course.py
index b032c6679..0ea0a8b5b 100644
--- a/course/templatetags/course.py
+++ b/course/templatetags/course.py
@@ -57,8 +57,8 @@ def parse_localization(entry):
 
 
 @register.filter
-def list_unselected(langs):
-    listed = list(filter(lambda x: x and x != get_language(), langs.split("|")))
+def list_languages(langs):
+    listed = list(filter(lambda x: x, langs.split("|")))
     return listed