diff --git a/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor b/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor
index 9b66cedb..1bc7805f 100644
--- a/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor
+++ b/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor
@@ -660,6 +660,14 @@
             homeSize = currentReport.homeSize;
            
         }
+        var editing = await ProtectedSessionStore.GetAsync<bool>("edit");
+        bool edit = editing.Value;
+        if(edit)
+        {
+            var rep = await ProtectedSessionStore.GetAsync<ReportModel>("currentReport");
+            ReportModel tempReport = rep.Value!;
+            homeSize = tempReport.homeSize;
+        }
         if (systems.Count > 0)
         {
             SetGraphicValues();
diff --git a/src/apps/blazor-app/Pages/AdvancedCalculations.razor b/src/apps/blazor-app/Pages/AdvancedCalculations.razor
index 5ab2df56..6e32ac98 100644
--- a/src/apps/blazor-app/Pages/AdvancedCalculations.razor
+++ b/src/apps/blazor-app/Pages/AdvancedCalculations.razor
@@ -273,6 +273,16 @@
                 }
 
             }
+            if(selectedSystem != 3)
+            {
+                for(int i = 0; i < systems.Count; i++)
+                {
+                    if (currentReport.systemId == systems[i].systemId)
+                    {
+                        selectedSystem = i;
+                    } 
+                }
+            }
 
 
         } else {