diff --git a/src/components/views/settings/tabs/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
index ab5b46bb7a..6109f74f35 100644
--- a/src/components/views/settings/tabs/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
@@ -54,6 +54,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         if (this.state.theme === newTheme) return;
 
         SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme);
+        this.setState({theme: newTheme});
         dis.dispatch({action: 'set_theme', value: newTheme});
     };