diff --git a/GUI/Model/Beam/SourceItems.h b/GUI/Model/Beam/SourceItems.h
index 54d8491f423bd319779017bde1ca097592fa2425..30b675483f1a0c42d7011a4e6b3314a439b85251 100644
--- a/GUI/Model/Beam/SourceItems.h
+++ b/GUI/Model/Beam/SourceItems.h
@@ -59,8 +59,6 @@ public:
     void setFootprint(const IFootprint* footprint);
 
     bool expandFootprint = true;
-    bool isExpandFootprint() const { return expandFootprint; }
-    void setExpandFootprint(bool b) { expandFootprint = b; }
 
 protected:
     SourceItem();
diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index a5cc1b9dad3d148e273e3887b66017562e6f4282..1202b7ee5b86abceef203049871124a9995bdc6a 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -37,10 +37,7 @@ FootprintForm::FootprintForm(QWidget* parent, SourceItem* item)
         });
     m_formLayout->addRow("Type:", typeCombo);
 
-    auto* collapser = GroupBoxCollapser::installIntoGroupBox(this);
-    collapser->setExpanded(item->isExpandFootprint());
-    connect(collapser, &GroupBoxCollapser::toggled, this,
-            [item](bool b) { item->setExpandFootprint(b); });
+    GroupBoxCollapser::installIntoGroupBox2(this, item->expandFootprint);
 
     updateFootprintWidgets();
 }