diff --git a/app/src/frontend/building/building-edit.tsx b/app/src/frontend/building/building-edit.tsx
index e29c09cd..b669d3e0 100644
--- a/app/src/frontend/building/building-edit.tsx
+++ b/app/src/frontend/building/building-edit.tsx
@@ -32,6 +32,7 @@ const BuildingEdit = (props) => {
     return (
         <Sidebar>
             <EditForm
+                key={props.building_id}  // provide key so that React re-creates if props change
                 {...section}
                 {...props}
                 cat={cat}
diff --git a/app/src/frontend/building/building-view.tsx b/app/src/frontend/building/building-view.tsx
index 424eaa94..672e9482 100644
--- a/app/src/frontend/building/building-view.tsx
+++ b/app/src/frontend/building/building-view.tsx
@@ -29,9 +29,7 @@ const BuildingView = (props) => {
     return (
         <Sidebar>
             <DataSection
-                key={section.slug}
                 cat={cat}
-                building_id={props.building_id}
                 {...section}
                 {...props}
             />