diff --git a/Elwig/App.xaml b/Elwig/App.xaml
index f758573..fb1d62a 100644
--- a/Elwig/App.xaml
+++ b/Elwig/App.xaml
@@ -40,7 +40,8 @@
         <ControlTemplate x:Key="WineVarietyTemplateExtended">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding SortId}" MinWidth="36" Margin="0,0,10,0"/>
-                <TextBlock Text="{Binding NameWithComment}"/>
+                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding CommentFormat}" FontSize="10" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
             </StackPanel>
         </ControlTemplate>
         <DataTemplate x:Key="WineVarietyTemplate">
diff --git a/Elwig/Models/WineVar.cs b/Elwig/Models/WineVar.cs
index 7293496..7f1ebc9 100644
--- a/Elwig/Models/WineVar.cs
+++ b/Elwig/Models/WineVar.cs
@@ -16,7 +16,7 @@ namespace Elwig.Models {
         [Column("comment")]
         public string? Comment { get; private set; }
 
-        public string NameWithComment => Name + ((Comment != null) ? $" ({Comment})" : "");
+        public string CommentFormat => (Comment != null) ? $" ({Comment})" : "";
 
         public override string ToString() {
             return Name;