diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 21b6dd2..f601af3 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -78,7 +78,7 @@
                 </a>
                 <ul class="dropdown-menu" role="menu">
                   <% I18n.available_locales.each do |locale| %>
-                    <li><a href="#"><%= locale.to_s %></a></li>
+                    <li><%= link_to(locale.to_s, url_for(locale: locale)) %></li>
                   <% end %>
                 </ul>
               </li>
diff --git a/features/homepage.feature b/features/homepage.feature
index 5b96ed3..c2c5cda 100644
--- a/features/homepage.feature
+++ b/features/homepage.feature
@@ -20,7 +20,6 @@ Feature: Homepage
     And I should see "Project"
     And I should see "Your projects"
 
-  @wip
   Scenario: Language selection
     Given I am at the homepage
     When I click the Languages link
--
libgit2 0.21.2