diff --git a/app/controllers/language_picker.coffee b/app/controllers/language_picker.coffee
index 56ace55..a292589 100644
--- a/app/controllers/language_picker.coffee
+++ b/app/controllers/language_picker.coffee
@@ -17,7 +17,9 @@ class LanguagePicker
   className: 'language-picker'
 
   constructor: ->
-    preferredLanguage = localStorage.preferredLanguage || DEFAULT
+    preferredLanguage = try location.search.match(/lang=([\$|\w]+)/)[1]
+    preferredLanguage ||= localStorage.preferredLanguage
+    preferredLanguage ||= DEFAULT
     HTML.attr 'data-language', preferredLanguage
 
     @el = $("<select class='#{@className}'></select>")
diff --git a/css/language_picker.styl b/css/language_picker.styl
index 89ac423..eafb1f7 100644
--- a/css/language_picker.styl
+++ b/css/language_picker.styl
@@ -1,5 +1,6 @@
 .language-picker
   bottom: 0
+  display: none // TODO
   position: fixed
   right: 0
   z-index: 3