1 files changed, 7 insertions, 2 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 242615bc0..1e724bb6e 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -156,8 +156,13 @@ class CustomThemeChooser extends React.Component {
     }
     toggleContent(e) {
         e.stopPropagation();
-        $(e.target).next().slideToggle();
-        $(e.target).toggleClass('open');
+        if ($(e.target).hasClass('theme-elements__header')) {
+            $(e.target).next().slideToggle();
+            $(e.target).toggleClass('open');
+        } else {
+            $(e.target).closest('.theme-elements__header').next().slideToggle();
+            $(e.target).closest('.theme-elements__header').toggleClass('open');
+        }
     }
     render() {
         const {formatMessage} = this.props.intl;