diff --git a/OpenCloud.xcodeproj/project.pbxproj b/OpenCloud.xcodeproj/project.pbxproj
index ab1b8a4f..617cb448 100644
--- a/OpenCloud.xcodeproj/project.pbxproj
+++ b/OpenCloud.xcodeproj/project.pbxproj
@@ -5293,7 +5293,7 @@
 				APP_BUILD_FLAGS = "$(inherited) DISABLE_APPSTORE_LICENSING";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = OpenCloud;
-				APP_SHORT_VERSION = 1.2.0;
+				APP_SHORT_VERSION = 1.2.1;
 				APP_VERSION = 4;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -5364,7 +5364,7 @@
 				APP_BUILD_FLAGS = "$(inherited) DISABLE_APPSTORE_LICENSING";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = OpenCloud;
-				APP_SHORT_VERSION = 1.2.0;
+				APP_SHORT_VERSION = 1.2.1;
 				APP_VERSION = 4;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
diff --git a/OpenCloudAppShared/Client/View Controllers/Location Breadcrumbs/ClientLocationPopupButton.swift b/OpenCloudAppShared/Client/View Controllers/Location Breadcrumbs/ClientLocationPopupButton.swift
index 3add3819..89bec975 100644
--- a/OpenCloudAppShared/Client/View Controllers/Location Breadcrumbs/ClientLocationPopupButton.swift	
+++ b/OpenCloudAppShared/Client/View Controllers/Location Breadcrumbs/ClientLocationPopupButton.swift	
@@ -59,10 +59,16 @@ open class ClientLocationPopupButton: ThemeCSSButton {
 		updateButton()
 	}
 
+	private var _didRefreshThemeAfterAttach = false
+
+	// One-shot post-attach refresh, mirroring ThemeCSSButton._hasRegistered.
 	open override func didMoveToWindow() {
 		super.didMoveToWindow()
 
-		self.updateButton()
+		if window != nil, !_didRefreshThemeAfterAttach {
+			_didRefreshThemeAfterAttach = true
+			updateButton()
+		}
 	}
 
 	func updateButton() {