diff --git a/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor b/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor
index 75cc081..8287bde 100644
--- a/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor
+++ b/src/AzureAppConfigurationEmulator/Components/Pages/FeatureManager.razor
@@ -45,7 +45,7 @@
 @code {
     private List<FeatureFlagConfigurationSetting> ConfigurationSettings { get; } = [];
 
-    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 List<FeatureFlagConfigurationSetting> FilteredConfigurationSettings => ConfigurationSettings.Where(setting => string.IsNullOrEmpty(SearchQuery) || setting.Key.Contains(SearchQuery) || setting.Description?.Contains(SearchQuery) == true || setting.Label?.Contains(SearchQuery) == true).OrderBy(setting => setting.Id).ToList();
 
     private string? SearchQuery { get; set; }