diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index dcf0d8b64e..47ff84af79 100644
--- a/app/controllers/preferences_controller.rb
+++ b/app/controllers/preferences_controller.rb
@@ -21,6 +21,9 @@ def update
                                     else
                                       params[:user][:preferred_editor]
                                     end
+
+    cookies["_osm_color_scheme"] = params[:color_scheme]
+
     if current_user.save
       # Use a partial so that it is rendered during the next page load in the correct language.
       flash[:notice] = { :partial => "preferences/update_success_flash" }