diff --git a/src/calamares/progresstree/ViewStepItem.cpp b/src/calamares/progresstree/ViewStepItem.cpp
index 5af73fcfd..27e56ef55 100644
--- a/src/calamares/progresstree/ViewStepItem.cpp
+++ b/src/calamares/progresstree/ViewStepItem.cpp
@@ -29,17 +29,17 @@ ViewStepItem::ViewStepItem( std::function< QString() > prettyName,
                             std::function< const Calamares::ViewStep*() > accessor,
                             ProgressTreeItem* parent )
     : ProgressTreeItem( parent )
+    , m_accessor( accessor )
+    , m_prettyName( prettyName )
     , m_step( nullptr )
 {
-    m_prettyName = prettyName;
-    m_accessor = accessor;
 }
 
 
 ViewStepItem::ViewStepItem( const Calamares::ViewStep* step, ProgressTreeItem* parent )
     : ProgressTreeItem( parent )
+    , m_step( step )
 {
-    m_step = step;
 }
 
 void
diff --git a/src/calamares/progresstree/ViewStepItem.h b/src/calamares/progresstree/ViewStepItem.h
index 3095ef43b..84b9e0e98 100644
--- a/src/calamares/progresstree/ViewStepItem.h
+++ b/src/calamares/progresstree/ViewStepItem.h
@@ -44,9 +44,9 @@ public:
     QVariant data( int role ) const override;
 
 private:
-    std::function< const Calamares::ViewStep*() > m_accessor;
-    std::function< QString() > m_prettyName;
-    const Calamares::ViewStep* m_step;
+    const std::function< const Calamares::ViewStep*() > m_accessor;
+    const std::function< QString() > m_prettyName;
+    const Calamares::ViewStep* const m_step;
 };