diff --git a/src/common/utils/modulesRegistry.h b/src/common/utils/modulesRegistry.h
index 8b957bd5b954..49b35173df79 100644
--- a/src/common/utils/modulesRegistry.h
+++ b/src/common/utils/modulesRegistry.h
@@ -270,7 +270,7 @@ inline registry::ChangeSet getRegistryPreviewChangeSet(const std::wstring instal
 
 inline std::vector<registry::ChangeSet> getAllOnByDefaultModulesChangeSets(const std::wstring installationDir)
 {
-    constexpr bool PER_USER = true;
+    const bool PER_USER = (registry::install_scope::get_current_install_scope() == registry::install_scope::InstallScope::PerUser);
     return { getSvgPreviewHandlerChangeSet(installationDir, PER_USER),
              getMdPreviewHandlerChangeSet(installationDir, PER_USER),
              getMonacoPreviewHandlerChangeSet(installationDir, PER_USER),
@@ -285,7 +285,7 @@ inline std::vector<registry::ChangeSet> getAllOnByDefaultModulesChangeSets(const
 
 inline std::vector<registry::ChangeSet> getAllModulesChangeSets(const std::wstring installationDir)
 {
-    constexpr bool PER_USER = true;
+    const bool PER_USER = (registry::install_scope::get_current_install_scope() == registry::install_scope::InstallScope::PerUser);
     return { getSvgPreviewHandlerChangeSet(installationDir, PER_USER),
              getMdPreviewHandlerChangeSet(installationDir, PER_USER),
              getMonacoPreviewHandlerChangeSet(installationDir, PER_USER),
diff --git a/src/modules/previewpane/powerpreview/powerpreview.cpp b/src/modules/previewpane/powerpreview/powerpreview.cpp
index 84d2a590dc3a..edbed16cb316 100644
--- a/src/modules/previewpane/powerpreview/powerpreview.cpp
+++ b/src/modules/previewpane/powerpreview/powerpreview.cpp
@@ -9,6 +9,7 @@
 #include <common/utils/resources.h>
 #include <common/utils/os-detect.h>
 #include <common/utils/process_path.h>
+#include <common/utils/registry.h>
 
 #include <SettingsAPI/settings_helpers.h>
 
@@ -24,7 +25,7 @@ PowerPreviewModule::PowerPreviewModule() :
     Logger::init(LogSettings::fileExplorerLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
 
     Logger::info("Initializing PowerPreviewModule");
-    const bool installPerUser = true;
+    const bool installPerUser = (registry::install_scope::get_current_install_scope() == registry::install_scope::InstallScope::PerUser);
     m_fileExplorerModules.push_back({ .settingName = L"svg-previewer-toggle-setting",
                                       .settingDescription = GET_RESOURCE_STRING(IDS_PREVPANE_SVG_SETTINGS_DESCRIPTION),
                                       .checkModuleGPOEnabledRuleFunction = powertoys_gpo::getConfiguredSvgPreviewEnabledValue,