diff --git a/sources/editor/Stride.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs b/sources/editor/Stride.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs
index 9711ac747f..197b2354e6 100644
--- a/sources/editor/Stride.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs
@@ -117,24 +117,12 @@ public async Task<GraphViewModel> GenerateSelectionPropertiesAsync(IEnumerable<I
 
             Selection = selectedObjects.ToList();
 
-            CanDisplayProperties = false;
-
-            ViewModel?.Destroy();
-
-            // We set to null now, in case this async method is invoked again while not being finished (otherwise it would dispose twice!)
-            ViewModel = null;
-
             // No selection, just clean up
-            if (Selection.Count == 0)
-            {
-                ViewModel = null;
-                FallbackMessage = EmptySelectionFallbackMessage;
-                return null;
-            }
-
-            string message;
-            if (!CanDisplaySelectedObjects(Selection, out message))
+            string message = EmptySelectionFallbackMessage;
+            if (Selection.Count == 0 || !CanDisplaySelectedObjects(Selection, out message))
             {
+                CanDisplayProperties = false;
+                ViewModel?.Destroy();
                 ViewModel = null;
                 FallbackMessage = message;
                 return null;
@@ -147,13 +135,17 @@ public async Task<GraphViewModel> GenerateSelectionPropertiesAsync(IEnumerable<I
                 if (localToken != currentToken)
                     return null;
 
+                ViewModel?.Destroy();
                 ViewModel = newViewModel;
                 CanDisplayProperties = true;
+                FallbackMessage = "";
             }
             catch (Exception exception)
             {
+                CanDisplayProperties = false;
                 FeedbackException(Selection, exception, out message);
                 FallbackMessage = message;
+                ViewModel?.Destroy();
                 ViewModel = null;
             }
             return ViewModel;
diff --git a/sources/editor/Stride.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs b/sources/editor/Stride.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs
index 14df338f94..499653d5be 100644
--- a/sources/editor/Stride.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs
@@ -80,7 +80,9 @@ private void PrepareItem(object sender, PropertyViewItemEventArgs e)
             {
                 propertyItem.IsExpanded = false;
             }
-            Dispatcher.BeginInvoke(new Action(() => ExpandSingleProperties(e.Container)));
+
+            Dispatcher.VerifyAccess();
+            ExpandSingleProperties(e.Container);
         }
 
         private PropertyViewItem GetPropertyItem(string propertyPath)
diff --git a/sources/editor/Stride.GameStudio/View/GameStudioWindow.xaml b/sources/editor/Stride.GameStudio/View/GameStudioWindow.xaml
index 9bd797f2e1..882c3b4d1a 100644
--- a/sources/editor/Stride.GameStudio/View/GameStudioWindow.xaml
+++ b/sources/editor/Stride.GameStudio/View/GameStudioWindow.xaml
@@ -757,8 +757,6 @@
                       </DockPanel>
                     </DockPanel>
 
-                    <TextBlock Grid.Row="4" Text="{Binding Session.ActiveProperties.FallbackMessage}" HorizontalAlignment="Center" VerticalAlignment="Center"
-                           Visibility="{Binding Session.ActiveProperties.CanDisplayProperties, Converter={sd:Chained {sd:InvertBool}, {sd:VisibleOrCollapsed}}}"/>
                     <sd:PropertyView x:Name="AssetPropertyView" Grid.Row="4"
                                        ItemsSource="{Binding Session.ActiveProperties.ViewModel.RootNode.Children}"
                                        Visibility="{Binding Session.ActiveProperties.CanDisplayProperties, Converter={sd:VisibleOrCollapsed}}">
@@ -875,6 +873,8 @@
                       </i:Interaction.Behaviors>
                     </sd:PropertyView>
 
+                    <TextBlock Grid.Row="4" Text="{Binding Session.ActiveProperties.FallbackMessage}" HorizontalAlignment="Center" VerticalAlignment="Center" Background="#99000000"/>
+
                     <GridSplitter Grid.Row="5" HorizontalAlignment="Stretch" Height="5" ResizeBehavior="PreviousAndNext"/>
 
                     <Border Grid.Row="6" Background="{StaticResource ToolBarBackgroundBrush}">
diff --git a/sources/presentation/Stride.Core.Presentation.Wpf/Controls/TreeView.cs b/sources/presentation/Stride.Core.Presentation.Wpf/Controls/TreeView.cs
index 54558f84d7..aa3d531933 100644
--- a/sources/presentation/Stride.Core.Presentation.Wpf/Controls/TreeView.cs
+++ b/sources/presentation/Stride.Core.Presentation.Wpf/Controls/TreeView.cs
@@ -794,13 +794,15 @@ private void ModifySelection([NotNull] ICollection<object> itemsToSelect, [NotNu
                 return;
 
             allowedSelectionChanges = true;
-            // Unselect and then select items
+
+            // Select and then unselect items to make sure we don't present an empty property grid while it's loading
+            ((NonGenericObservableListWrapper<object>)SelectedItems).AddRange(itemsToSelect);
+
             foreach (var itemToUnSelect in itemsToUnselect)
             {
                 SelectedItems.Remove(itemToUnSelect);
             }
 
-            ((NonGenericObservableListWrapper<object>)SelectedItems).AddRange(itemsToSelect);
             allowedSelectionChanges = false;
 
             if (itemsToUnselect.Contains(lastShiftRoot))