diff --git a/window-customize.c b/window-customize.c
index 0f09eba8..98387e50 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -398,11 +398,11 @@ window_customize_build_options(struct window_customize_modedata *data,
 
 	for (i = 0; i < size; i++) {
 		if (oo2 != NULL)
-			o = options_get(oo0, list[i]);
+			o = options_get(oo2, list[i]);
 		if (o == NULL && oo1 != NULL)
 			o = options_get(oo1, list[i]);
 		if (o == NULL)
-			o = options_get(oo2, list[i]);
+			o = options_get(oo0, list[i]);
 		if (options_owner(o) == oo2)
 			scope = scope2;
 		else if (options_owner(o) == oo1)