diff --git a/app/views/account/_language_selection.html.erb b/app/views/account/_language_selection.html.erb
new file mode 100644
index 000000000..bf8b564f6
--- /dev/null
+++ b/app/views/account/_language_selection.html.erb
@@ -0,0 +1,11 @@
+<div id="footer_language_selection" class="footer_div">
+  <% if User.language_choices.keys.size > 1 %>
+    <% form_tag do %>
+      <div class="form-element">
+        <noscript><label><%=t 'layouts.application.language' %></label></noscript>
+        <%= locale_dropdown(nil, { :default => I18n.locale, :pre_text => t('layouts.application.choose_language') }) -%>
+        <noscript><%= submit_tag t('layouts.application.change_language') %></noscript>
+      </div>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index e4eab01c4..e316ceeac 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -419,17 +419,7 @@
           <div style="clear:both;"></div>
         </div>
 
-        <div id="footer_language_selection" class="footer_div">
-          <% if User.language_choices.keys.size > 1 %>
-            <% form_tag do %>
-              <div class="form-element">
-                <noscript><label><%=t 'layouts.application.language' %></label></noscript>
-                <%= locale_dropdown(nil, { :default => I18n.locale, :pre_text => t('layouts.application.choose_language') }) -%>
-                <noscript><%= submit_tag t('layouts.application.change_language') %></noscript>
-              </div>
-            <% end %>
-          <% end %>
-        </div>
+        <%= render 'account/language_selection' %>
 
       <% else -%>