diff --git a/src/Caliburn.Micro.Core/ConductorBaseWithActiveItem.cs b/src/Caliburn.Micro.Core/ConductorBaseWithActiveItem.cs index eb05e3948..bda5d860f 100644 --- a/src/Caliburn.Micro.Core/ConductorBaseWithActiveItem.cs +++ b/src/Caliburn.Micro.Core/ConductorBaseWithActiveItem.cs @@ -43,11 +43,12 @@ protected virtual async Task ChangeActiveItemAsync(T newItem, bool closePrevious newItem = EnsureItem(newItem); + _activeItem = newItem; + NotifyOfPropertyChange(nameof(ActiveItem)); + if (IsActive) await ScreenExtensions.TryActivateAsync(newItem, cancellationToken); - _activeItem = newItem; - NotifyOfPropertyChange(nameof(ActiveItem)); OnActivationProcessed(_activeItem, true); }