diff --git a/src/components/SettingsViewer.tsx b/src/components/SettingsViewer.tsx
index 9c95f10..0277c1d 100644
--- a/src/components/SettingsViewer.tsx
+++ b/src/components/SettingsViewer.tsx
@@ -216,6 +216,27 @@ export function SettingsViewer() {
               </p>
             </div>
 
+            {/* Contribution Tiers */}
+            <div className="space-y-3">
+              <h4 className="text-sm font-medium">Contribute</h4>
+              <div className="grid grid-cols-3 gap-2">
+                {contributionTiers.map(({ amount, icon: Icon }) => (
+                  <Button
+                    key={amount}
+                    variant="outline"
+                    size="default"
+                    onClick={() => openSupportWindow(amount)}
+                    className="flex-col h-auto py-3 gap-1.5"
+                  >
+                    <Icon className="h-5 w-5 text-muted-foreground" />
+                    <span className="text-base font-semibold">
+                      {formatAmount(amount)}
+                    </span>
+                  </Button>
+                ))}
+              </div>
+            </div>
+
             {/* Show Monthly Goal Toggle */}
             <div className="flex items-center justify-between gap-4">
               <div className="space-y-0.5">
@@ -262,27 +283,6 @@ export function SettingsViewer() {
               </div>
             </div>
 
-            {/* Contribution Tiers */}
-            <div className="space-y-3">
-              <h4 className="text-sm font-medium">Contribute</h4>
-              <div className="grid grid-cols-3 gap-2">
-                {contributionTiers.map(({ amount, icon: Icon }) => (
-                  <Button
-                    key={amount}
-                    variant="outline"
-                    size="default"
-                    onClick={() => openSupportWindow(amount)}
-                    className="flex-col h-auto py-3 gap-1"
-                  >
-                    <Icon className="h-5 w-5" />
-                    <span className="text-sm font-semibold">
-                      {formatAmount(amount)}
-                    </span>
-                  </Button>
-                ))}
-              </div>
-            </div>
-
             {/* Top Contributors This Month */}
             {topDonors && topDonors.length > 0 && (
               <div className="space-y-3">
diff --git a/src/components/ZapWindow.tsx b/src/components/ZapWindow.tsx
index d803f26..dde64ef 100644
--- a/src/components/ZapWindow.tsx
+++ b/src/components/ZapWindow.tsx
@@ -150,6 +150,13 @@ export function ZapWindow({
   const [paymentTimedOut, setPaymentTimedOut] = useState(false);
   const [zapAnonymously, setZapAnonymously] = useState(false);
 
+  // Update selected amount when defaultAmount prop changes
+  useEffect(() => {
+    if (defaultAmount) {
+      setSelectedAmount(defaultAmount);
+    }
+  }, [defaultAmount]);
+
   // Editor ref and search functions
   const editorRef = useRef<MentionEditorHandle>(null);
   const { searchProfiles } = useProfileSearch();