diff --git a/GUI/View/Sample/SampleEditor.cpp b/GUI/View/Sample/SampleEditor.cpp
index 86049cc7cce8b0c74f26d464e2434036cf07e1b4..f1f3b68672dfb661e38ee8a91ab8f63a796f5392 100644
--- a/GUI/View/Sample/SampleEditor.cpp
+++ b/GUI/View/Sample/SampleEditor.cpp
@@ -25,7 +25,6 @@
 #include <QPushButton>
 
 SampleEditor::SampleEditor()
-    : m_current_sample_widget(nullptr)
 {
     QScrollArea::setWidgetResizable(true);
     QScrollArea::setWidget(new QWidget());
@@ -35,8 +34,6 @@ SampleEditor::~SampleEditor() = default;
 
 void SampleEditor::setCurrentSample(SampleItem* t)
 {
-    m_current_sample_widget = nullptr;
-
     if (t == nullptr) {
         QScrollArea::setWidget(new QWidget());
         return;
@@ -51,8 +48,8 @@ void SampleEditor::setCurrentSample(SampleItem* t)
 
     t->updateDefaultLayerColors();
 
-    m_current_sample_widget = new SampleForm(t, ec);
-    ec->setSampleForm(m_current_sample_widget);
-    m_current_sample_widget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-    QScrollArea::setWidget(m_current_sample_widget);
+    auto* f = new SampleForm(t, ec);
+    ec->setSampleForm(f);
+    f->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    QScrollArea::setWidget(f);
 }
diff --git a/GUI/View/Sample/SampleEditor.h b/GUI/View/Sample/SampleEditor.h
index 233c88cc4b48da465efdc78e3a5293d848de72ac..cac47b6727886c4e3adfe5ca657ee48c5c96c279 100644
--- a/GUI/View/Sample/SampleEditor.h
+++ b/GUI/View/Sample/SampleEditor.h
@@ -20,7 +20,6 @@
 
 class Item3D;
 class SampleEditorController;
-class SampleForm;
 class SampleItem;
 
 //! Sample editor with layer oriented presentation of a sample
@@ -38,7 +37,6 @@ signals:
     void modified();
 
 private:
-    SampleForm* m_current_sample_widget;
     std::unique_ptr<SampleEditorController> m_edit_controller;
 };