diff --git a/src/components/Settings/ThemeSelector.vue b/src/components/Settings/ThemeSelector.vue
index a3925cc5..8009241c 100644
--- a/src/components/Settings/ThemeSelector.vue
+++ b/src/components/Settings/ThemeSelector.vue
@@ -100,8 +100,10 @@ export default {
     },
     /* Closes the theme color configurator popup */
     closeThemeConfigurator() {
-      this.$store.commit(Keys.SET_MODAL_OPEN, false);
-      this.themeConfiguratorOpen = false;
+      if (this.themeConfiguratorOpen) {
+        this.$store.commit(Keys.SET_MODAL_OPEN, false);
+        this.themeConfiguratorOpen = false;
+      }
     },
     /* Updates theme. Checks if the new theme is local or external,
     and calls appropirate updating function. Updates local storage */