diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index a5cd803866..0bb7f3a42f 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1766,6 +1766,7 @@ void LLPanelPreferenceSkins::onSkinChanged()
 	m_Skin = (m_pSkinCombo) ? m_pSkinCombo->getSelectedValue().asString() : "default";
 	m_SkinTheme = "default";
 	refreshSkinThemeList();
+	onSkinThemeChanged(); // make sure we initialize a theme for our new skin
 }
 
 void LLPanelPreferenceSkins::onSkinThemeChanged()