diff --git a/Core/Handler/SettingsHandler.cs b/Core/Handler/SettingsHandler.cs
index bd50c70..f192994 100644
--- a/Core/Handler/SettingsHandler.cs
+++ b/Core/Handler/SettingsHandler.cs
@@ -141,10 +141,22 @@ public class SettingsHandler : CommonHandler
             CallbackData = $"option|{From.Id}|edit|{option.OptionId}"
         };
 
-        if (option.OptionType == OptionType.OnOff)
+        switch (option.OptionType)
         {
-            var isEnabled = await ((IOption<bool>) option).GetValueAsync(Chat.Id);
-            button.Text += isEnabled ? " 🟢" : " 🔴";
+            case OptionType.OnOff:
+            {
+                var isEnabled = await ((IOption<bool>) option).GetValueAsync(Chat.Id);
+                button.Text += isEnabled ? " 🟢" : " 🔴";
+                break;
+            }
+
+            case OptionType.Select:
+            {
+                var value = await ((IOption<string>) option).GetValueAsync(Chat.Id);
+                var currentChoice = option.ChoiceList.Single(x => x.Id == value);
+                button.Text += $" ({currentChoice.ShortName})";
+                break;
+            }
         }
 
         return button;