diff --git a/src/AzureAppConfigurationEmulator/Components/Pages/ConfigurationExplorer.razor b/src/AzureAppConfigurationEmulator/Components/Pages/ConfigurationExplorer.razor
index e2c7031..25a60e2 100644
--- a/src/AzureAppConfigurationEmulator/Components/Pages/ConfigurationExplorer.razor
+++ b/src/AzureAppConfigurationEmulator/Components/Pages/ConfigurationExplorer.razor
@@ -47,9 +47,9 @@
 </div>
 
 @code {
-    private ICollection<ConfigurationSetting> ConfigurationSettings { get; } = [];
+    private List<ConfigurationSetting> ConfigurationSettings { get; } = [];
 
-    private IEnumerable<ConfigurationSetting> FilteredConfigurationSettings => ConfigurationSettings.Where(setting => string.IsNullOrEmpty(SearchQuery) || setting.Key.Contains(SearchQuery) || setting.Label?.Contains(SearchQuery) == true || setting.Value?.Contains(SearchQuery) == true).ToList();
+    private List<ConfigurationSetting> FilteredConfigurationSettings => ConfigurationSettings.Where(setting => string.IsNullOrEmpty(SearchQuery) || setting.Key.Contains(SearchQuery) || setting.Label?.Contains(SearchQuery) == true || setting.Value?.Contains(SearchQuery) == true).ToList();
 
     private bool IsValuesHidden { get; set; } = true;
 
@@ -98,9 +98,12 @@
         {
             await ConfigurationSettingRepository.Update(setting);
 
-            ConfigurationSettings.Remove(SelectedConfigurationSettings.Single());
-            ConfigurationSettings.Add(setting);
-            StateHasChanged();
+            if (ConfigurationSettings.IndexOf(SelectedConfigurationSettings.Single()) is var index and not -1)
+            {
+                ConfigurationSettings.RemoveAt(index);
+                ConfigurationSettings.Insert(index, setting);
+                StateHasChanged();
+            }
 
             SelectedConfigurationSettings.Clear();
             StateHasChanged();
diff --git a/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor b/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor
index 09813e2..75cc081 100644
--- a/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor
+++ b/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor
@@ -43,9 +43,9 @@
 </div>
 
 @code {
-    private ICollection<FeatureFlagConfigurationSetting> ConfigurationSettings { get; } = [];
+    private List<FeatureFlagConfigurationSetting> ConfigurationSettings { get; } = [];
 
-    private IEnumerable<FeatureFlagConfigurationSetting> FilteredConfigurationSettings => ConfigurationSettings.Where(setting => string.IsNullOrEmpty(SearchQuery) || setting.Key.Contains(SearchQuery) || setting.Description?.Contains(SearchQuery) == true || setting.Label?.Contains(SearchQuery) == true).ToList();
+    private List<FeatureFlagConfigurationSetting> FilteredConfigurationSettings => ConfigurationSettings.Where(setting => string.IsNullOrEmpty(SearchQuery) || setting.Key.Contains(SearchQuery) || setting.Description?.Contains(SearchQuery) == true || setting.Label?.Contains(SearchQuery) == true).ToList();
 
     private string? SearchQuery { get; set; }