diff --git a/src/easyreflectometry/project.py b/src/easyreflectometry/project.py
index e9b72d15..5ecc946b 100644
--- a/src/easyreflectometry/project.py
+++ b/src/easyreflectometry/project.py
@@ -157,7 +157,8 @@ def models(self) -> ModelCollection:
     @models.setter
     def models(self, models: ModelCollection) -> None:
         self._replace_collection(models, self._models)
-        self._current_model_index = 0
+        # Use setter to update indicies for current model, assembly and layer
+        self.current_model_index = 0
         self._materials.extend(self._get_materials_in_models())
         for model in self._models:
             model.interface = self._calculator