diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index b12bede..0f2cc5b 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -18,6 +18,7 @@ body:
       label: Package
       options:
         - "UI"
+        - "UI.Controls.ChipBox"
         - "UI.Controls.DropDownList"
         - "UI.Controls.FilePicker"
         - "UI.Controls.Validator"
diff --git a/src/MADE.UI.Controls.ChipBox/Themes/Generic.xaml b/src/MADE.UI.Controls.ChipBox/Themes/Generic.xaml
index d55bd2f..9689e61 100644
--- a/src/MADE.UI.Controls.ChipBox/Themes/Generic.xaml
+++ b/src/MADE.UI.Controls.ChipBox/Themes/Generic.xaml
@@ -84,7 +84,7 @@
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <ContentPresenter x:Name="ChipContent" VerticalContentAlignment="Center" />
+                            <ContentPresenter x:Name="ChipContent" VerticalContentAlignment="Center" Content="{TemplateBinding Content}" />
                             <Button Grid.Column="1" x:Name="ChipRemoveButton" Style="{StaticResource ChipRemoveButtonStyle}"></Button>
                         </Grid>
                     </Border>