diff --git a/src/Backend/AutopilotMonitor.Functions/Services/TenantConfigurationService.cs b/src/Backend/AutopilotMonitor.Functions/Services/TenantConfigurationService.cs
index 136d2dc4..069dab23 100644
--- a/src/Backend/AutopilotMonitor.Functions/Services/TenantConfigurationService.cs
+++ b/src/Backend/AutopilotMonitor.Functions/Services/TenantConfigurationService.cs
@@ -234,6 +234,7 @@ namespace AutopilotMonitor.Functions.Services
                 { "ShowEnrollmentSummary", config.ShowEnrollmentSummary },
                 { "EnrollmentSummaryTimeoutSeconds", config.EnrollmentSummaryTimeoutSeconds },
                 { "EnrollmentSummaryBrandingImageUrl", config.EnrollmentSummaryBrandingImageUrl },
+                { "EnrollmentSummaryLaunchRetrySeconds", config.EnrollmentSummaryLaunchRetrySeconds },
                 { "HelloWaitTimeoutSeconds", config.HelloWaitTimeoutSeconds },
                 { "AgentMaxLifetimeMinutes", config.AgentMaxLifetimeMinutes },
                 { "SendTraceEvents", config.SendTraceEvents },
@@ -293,6 +294,7 @@ namespace AutopilotMonitor.Functions.Services
                 ShowEnrollmentSummary = entity.GetBoolean("ShowEnrollmentSummary"),
                 EnrollmentSummaryTimeoutSeconds = entity.GetInt32("EnrollmentSummaryTimeoutSeconds"),
                 EnrollmentSummaryBrandingImageUrl = entity.GetString("EnrollmentSummaryBrandingImageUrl"),
+                EnrollmentSummaryLaunchRetrySeconds = entity.GetInt32("EnrollmentSummaryLaunchRetrySeconds"),
                 HelloWaitTimeoutSeconds = entity.GetInt32("HelloWaitTimeoutSeconds") ?? 30,
                 AgentMaxLifetimeMinutes = entity.GetInt32("AgentMaxLifetimeMinutes"),
                 SendTraceEvents = entity.GetBoolean("SendTraceEvents") ?? true,
diff --git a/src/Web/autopilot-monitor-web/app/gather-rules/components/GatherRuleCard.tsx b/src/Web/autopilot-monitor-web/app/gather-rules/components/GatherRuleCard.tsx
index f965979a..92b303be 100644
--- a/src/Web/autopilot-monitor-web/app/gather-rules/components/GatherRuleCard.tsx
+++ b/src/Web/autopilot-monitor-web/app/gather-rules/components/GatherRuleCard.tsx
@@ -290,7 +290,7 @@ export function GatherRuleCard({
           {!readOnly && (
             <div className="flex items-center justify-end space-x-3 pt-4 border-t border-gray-200">
               <button
-                onClick={onExport}
+                onClick={(e) => { e.stopPropagation(); onExport(); }}
                 className="px-4 py-2 text-sm bg-gray-100 text-gray-700 rounded-lg hover:bg-gray-200 transition-colors flex items-center space-x-2"
                 title="Export rule as JSON"
               >
@@ -301,7 +301,7 @@ export function GatherRuleCard({
               </button>
               {canEdit && (
                 <button
-                  onClick={onStartEditing}
+                  onClick={(e) => { e.stopPropagation(); onStartEditing(); }}
                   className="px-4 py-2 text-sm bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 transition-colors flex items-center space-x-2"
                   title="Edit rule"
                 >
@@ -313,7 +313,7 @@ export function GatherRuleCard({
               )}
               {!rule.isBuiltIn && !rule.isCommunity && (
                 <button
-                  onClick={onDelete}
+                  onClick={(e) => { e.stopPropagation(); onDelete(); }}
                   disabled={deletingRule === rule.ruleId}
                   className="px-4 py-2 text-sm bg-red-600 text-white rounded-lg hover:bg-red-700 disabled:opacity-50 disabled:cursor-not-allowed transition-colors flex items-center space-x-2"
                   title="Delete rule"
diff --git a/src/Web/autopilot-monitor-web/app/gather-rules/page.tsx b/src/Web/autopilot-monitor-web/app/gather-rules/page.tsx
index 954b0263..21e253ee 100644
--- a/src/Web/autopilot-monitor-web/app/gather-rules/page.tsx
+++ b/src/Web/autopilot-monitor-web/app/gather-rules/page.tsx
@@ -242,6 +242,8 @@ export default function GatherRulesPage() {
   };
 
   const startEditing = (rule: GatherRule) => {
+    // Ensure the card stays expanded when entering edit mode
+    setExpandedRuleId(rule.ruleId);
     setEditingRuleId(rule.ruleId);
     setEditForm({
       ruleId: rule.ruleId,