diff --git a/shared/components/rstack-space-switcher.ts b/shared/components/rstack-space-switcher.ts
index c184322..f4cec69 100644
--- a/shared/components/rstack-space-switcher.ts
+++ b/shared/components/rstack-space-switcher.ts
@@ -970,7 +970,7 @@ export class RStackSpaceSwitcher extends HTMLElement {
 					html += `
 					<div class="scope-row">
 						<span class="scope-label">Data scope:</span>
-						<select class="scope-select" data-mod-id="${m.id}">
+						<select class="scope-select data-scope-select" data-mod-id="${m.id}">
 							<option value="space" ${m.scoping.currentScope === "space" ? "selected" : ""}>Space</option>
 							<option value="global" ${m.scoping.currentScope === "global" ? "selected" : ""}>Global</option>
 						</select>
@@ -1068,7 +1068,7 @@ export class RStackSpaceSwitcher extends HTMLElement {
 
 				// Collect scope overrides
 				const scopeOverrides: Record<string, string> = {};
-				container.querySelectorAll(".scope-select").forEach((sel) => {
+				container.querySelectorAll(".data-scope-select").forEach((sel) => {
 					const el = sel as HTMLSelectElement;
 					scopeOverrides[el.dataset.modId!] = el.value;
 				});