diff --git a/app/assets/javascripts/discourse/lib/theme-selector.js.es6 b/app/assets/javascripts/discourse/lib/theme-selector.js.es6
index 295f8664dd..40cb9eabe5 100644
--- a/app/assets/javascripts/discourse/lib/theme-selector.js.es6
+++ b/app/assets/javascripts/discourse/lib/theme-selector.js.es6
@@ -2,7 +2,7 @@ import { ajax } from 'discourse/lib/ajax';
 import { refreshCSS } from 'discourse/initializers/live-development';
 const keySelector = 'meta[name=discourse_theme_key]';
 
-function currentThemeKey() {
+export function currentThemeKey() {
   let themeKey = null;
   let elem = _.first($(keySelector));
   if (elem) {
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6
index 6de4f04767..9bb0d645b1 100644
--- a/app/assets/javascripts/discourse/routes/preferences.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences.js.es6
@@ -1,6 +1,7 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 import showModal from 'discourse/lib/show-modal';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { currentThemeKey } from 'discourse/lib/theme-selector';
 
 export default RestrictedUserRoute.extend({
   model() {
@@ -12,7 +13,7 @@ export default RestrictedUserRoute.extend({
     controller.setProperties({
       model: user,
       newNameInput: user.get('name'),
-      selectedTheme: $.cookie('preview_style')
+      selectedTheme: $.cookie('preview_style') || currentThemeKey()
     });
   },