diff --git a/src/OneWare.Essentials/Controls/SearchComboBox.axaml b/src/OneWare.Essentials/Controls/SearchComboBox.axaml
index 195ebfd3..9634ce23 100644
--- a/src/OneWare.Essentials/Controls/SearchComboBox.axaml
+++ b/src/OneWare.Essentials/Controls/SearchComboBox.axaml
@@ -61,22 +61,22 @@
                                 <Border Background="{DynamicResource ThemeBackgroundBrush}"
                                         BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                                         BorderThickness="1">
-                                        <Grid RowDefinitions="Auto, Auto, Auto">
-                                            <Border Padding="2 1">
+                                        <DockPanel>
+                                            <Border DockPanel.Dock="Top" Padding="2 1">
                                                 <DockPanel>
                                                     <Image DockPanel.Dock="Left" VerticalAlignment="Center" Height="14" Margin="2 0" Source="{DynamicResource VsImageLib.Search16XMd}"/>
                                                     <TextBox DockPanel.Dock="Left" VerticalAlignment="Center" Watermark="Search..." BorderThickness="0" Name="PART_SearchBox"/>
                                                 </DockPanel>
                                             </Border>
-                                            <Border Grid.Row="1" Height="1" Margin="0 2" Background="{DynamicResource ThemeBorderLowBrush}"/>
-                                            <ScrollViewer Grid.Row="2"
+                                            <Border DockPanel.Dock="Top" Height="1" Margin="0 2" Background="{DynamicResource ThemeBorderLowBrush}"/>
+                                            <ScrollViewer DockPanel.Dock="Bottom"
                                                           HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                                           VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
                                                           IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}">
                                                 <ItemsPresenter Name="PART_ItemsPresenter"
                                                                 ItemsPanel="{TemplateBinding ItemsPanel}" />
                                             </ScrollViewer>
-                                        </Grid>
+                                        </DockPanel>
                                     
                                 </Border>
                             </Popup>
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectPinPlannerView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectPinPlannerView.axaml
index f24b8fd5..19f522c9 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectPinPlannerView.axaml
+++ b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectPinPlannerView.axaml
@@ -38,7 +38,7 @@
                     <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="5" Margin="0 0 5 0">
                         <TextBlock Text="Board:" VerticalAlignment="Center" />
 
-                        <ComboBox ItemsSource="{Binding FpgaPackages}"
+                        <controls:SearchComboBox IsInteractive="False" ItemsSource="{Binding FpgaPackages}"
                                                  MinWidth="150"
                                                  SelectedItem="{Binding SelectedFpgaPackage, Mode=TwoWay}">
                             <ComboBox.ItemTemplate>
@@ -46,7 +46,7 @@
                                     <TextBlock Text="{Binding Name}" Margin="5 0" VerticalAlignment="Center" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
-                        </ComboBox>
+                        </controls:SearchComboBox>
 
                         <Button Command="{Binding RefreshFpgasButtonAsync}"
                                 CommandParameter="{Binding #UniversalFpgaProjectCompileViewView}"