diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index 96fe32a..9f3ae00 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -4,6 +4,26 @@
     <!-- Add Resources Here -->
     <ControlTheme TargetType="u:MultiComboBox" x:Key="{x:Type u:MultiComboBox}">
         <Setter Property="Focusable" Value="True"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:MultiComboBox">
+                <Panel>
+                    <ToggleButton Name="button">
+                        <ItemsControl ItemsSource="{TemplateBinding SelectedItems}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <WrapPanel Orientation="Horizontal"/>
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                    </ToggleButton>
+                    <Popup PlacementTarget="button" IsOpen="{Binding #button.IsChecked}">
+                        <ListBox SelectionMode="Multiple"  ItemsSource="{TemplateBinding ItemsSource}" SelectedItems="{TemplateBinding SelectedItems}">
+                            
+                        </ListBox>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
     </ControlTheme>
     
     <ControlTheme TargetType="u:MultiComboBoxItem" x:Key="{x:Type u:MultiComboBoxItem}">
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index a369754..9a138a9 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -20,6 +20,7 @@
         <ResourceInclude Source="KeyGestureInput.axaml" />
         <ResourceInclude Source="Loading.axaml" />
         <ResourceInclude Source="MessageBox.axaml" />
+        <ResourceInclude Source="MultiComboBox.axaml" />
         <ResourceInclude Source="NavMenu.axaml" />
         <ResourceInclude Source="NumericUpDown.axaml" />
         <ResourceInclude Source="NumPad.axaml" />
diff --git a/src/Ursa/Controls/ComboBox/MultiComboBox.cs b/src/Ursa/Controls/ComboBox/MultiComboBox.cs
index 3bdba24..7ce9d28 100644
--- a/src/Ursa/Controls/ComboBox/MultiComboBox.cs
+++ b/src/Ursa/Controls/ComboBox/MultiComboBox.cs
@@ -1,4 +1,6 @@
-using System.Collections.ObjectModel;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -8,8 +10,6 @@ namespace Ursa.Controls;
 
 public class MultiComboBox: SelectingItemsControl
 {
-    private ComboBox _box;
-
     private static ITemplate<Panel?> _defaultPanel = new FuncTemplate<Panel?>(() => new VirtualizingStackPanel());
 
     public static readonly StyledProperty<bool> IsDropDownOpenProperty =