diff --git a/preferences/inc/class.preferences_settings.inc.php b/preferences/inc/class.preferences_settings.inc.php
index 21b50f125b..79088e6d4f 100644
--- a/preferences/inc/class.preferences_settings.inc.php
+++ b/preferences/inc/class.preferences_settings.inc.php
@@ -470,6 +470,8 @@ class preferences_settings
 	{
 		$this->appname = $appname == 'common' ? 'preferences' : $appname;
 
+		// Set framework here to make sure we get the right settings for user's [newly] selected template
+		$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw']->preferences->data['common']['template_set'];
 		translation::add_app($this->appname);
 		if($this->appname != 'preferences')
 		{