diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 6a8c2171a..e41c80062 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -138,7 +138,6 @@ CalamaresApplication::onPluginsReady()
         //TODO: move somewhere
         ProgressTreeModel* m = new ProgressTreeModel( this );
         ProgressTreeView::instance()->setModel( m );
-        ProgressTreeView::instance()->expandAll();
     });
 }
 
diff --git a/src/calamares/progresstree/ProgressTreeView.cpp b/src/calamares/progresstree/ProgressTreeView.cpp
index e820b48ee..1fa1eb3f1 100644
--- a/src/calamares/progresstree/ProgressTreeView.cpp
+++ b/src/calamares/progresstree/ProgressTreeView.cpp
@@ -51,3 +51,11 @@ ProgressTreeView::~ProgressTreeView()
 {
 
 }
+
+
+void
+ProgressTreeView::setModel( QAbstractItemModel* model )
+{
+    QTreeView::setModel( model );
+    expandAll();
+}
diff --git a/src/calamares/progresstree/ProgressTreeView.h b/src/calamares/progresstree/ProgressTreeView.h
index 70fde63f5..382ad3f5d 100644
--- a/src/calamares/progresstree/ProgressTreeView.h
+++ b/src/calamares/progresstree/ProgressTreeView.h
@@ -30,6 +30,8 @@ public:
     explicit ProgressTreeView( QWidget* parent = 0 );
     virtual ~ProgressTreeView();
 
+    void setModel( QAbstractItemModel* model ) override;
+
 private:
     static ProgressTreeView* s_instance;
 };