diff --git a/src/main/frontend/handler/plugin.cljs b/src/main/frontend/handler/plugin.cljs
index 5e68567969..dd926cb143 100644
--- a/src/main/frontend/handler/plugin.cljs
+++ b/src/main/frontend/handler/plugin.cljs
@@ -163,7 +163,7 @@
 
 (defn get-enabled-plugins-if-setting-schema
   []
-  (when-let [plugins (seq (state/get-all-enabled?-installed-plugins nil true))]
+  (when-let [plugins (seq (state/get-all-enabled?-installed-plugins))]
     (filter #(has-setting-schema? (:id %)) plugins)))
 
 (defn setup-install-listener!
diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs
index 1a55772880..51dda4059e 100644
--- a/src/main/frontend/state.cljs
+++ b/src/main/frontend/state.cljs
@@ -1764,22 +1764,20 @@ Similar to re-frame subscriptions"
   (when-let [id (and id (keyword id))]
     (get-in @state [:plugin/installed-plugins id])))
 
-(defn get-all-enabled?-installed-plugins
-  ([enabled? include-unpacked?]
-   (filterv
-     #(and (if include-unpacked? true (:iir %))
-           (if-not (boolean? enabled?) true (= (not enabled?) (boolean (get-in % [:settings :disabled])))))
-     (vals (:plugin/installed-plugins @state)))))
-
 (defn get-enabled?-installed-plugins
-  ([theme?] (get-enabled?-installed-plugins theme? true false))
-  ([theme? enabled? include-unpacked?]
+  ([theme?] (get-enabled?-installed-plugins theme? true false false))
+  ([theme? enabled? include-unpacked? include-all?]
    (filterv
      #(and (if include-unpacked? true (:iir %))
            (if-not (boolean? enabled?) true (= (not enabled?) (boolean (get-in % [:settings :disabled]))))
-           (= (boolean theme?) (:theme %)))
+           (or include-all? (= (boolean theme?) (:theme %))))
      (vals (:plugin/installed-plugins @state)))))
 
+(defn get-all-enabled?-installed-plugins
+  ([] (get-all-enabled?-installed-plugins true true))
+  ([enabled? include-unpacked?]
+   (get-enabled?-installed-plugins nil enabled? include-unpacked? true)))
+
 (defn lsp-enabled?-or-theme
   []
   (:plugin/enabled @state))