diff --git a/ILSpy/SearchPane.xaml b/ILSpy/SearchPane.xaml
index a07b9ab42..90f646b2b 100644
--- a/ILSpy/SearchPane.xaml
+++ b/ILSpy/SearchPane.xaml
@@ -1,5 +1,6 @@
 <UserControl x:Class="ICSharpCode.ILSpy.SearchPane" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="clr-namespace:ICSharpCode.ILSpy.Controls"
+		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+		xmlns:controls="clr-namespace:ICSharpCode.ILSpy.Controls"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Name="self" mc:Ignorable="d"
 		d:DesignHeight="300" d:DesignWidth="300">
@@ -35,25 +36,32 @@
 				</StackPanel>
 			</Grid>
 		</Border>
-		<ListBox Grid.Row="1" BorderThickness="0,0,0,0" HorizontalContentAlignment="Stretch" KeyDown="ListBox_KeyDown"
-				MouseDoubleClick="ListBox_MouseDoubleClick" Name="listBox" SelectionMode="Single">
-			<ListBox.ItemTemplate>
-				<DataTemplate>
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="20" />
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Image Height="16" Width="16" HorizontalAlignment="Left" Source="{Binding Image}" />
-						<TextBlock Grid.Column="1" Text="{Binding Name}" />
-						<StackPanel Grid.Column="2" HorizontalAlignment="Right" Orientation="Horizontal" Margin="0,0,2,0">
-							<Image Height="16" Margin="4,0,4,0" Width="16" Source="{Binding LocationImage}" />
-							<TextBlock Text="{Binding Location}" TextTrimming="CharacterEllipsis" />
-						</StackPanel>
-					</Grid>
-				</DataTemplate>
-			</ListBox.ItemTemplate>
-		</ListBox>
+		<ListView Grid.Row="1" BorderThickness="0,0,0,0" HorizontalContentAlignment="Stretch" KeyDown="ListBox_KeyDown"
+				MouseDoubleClick="ListBox_MouseDoubleClick" Name="listBox" SelectionMode="Single" controls:SortableGridViewColumn.SortMode="Automatic" controls:GridViewColumnAutoSize.AutoWidth="50%;50%">
+			<ListView.View>
+				<GridView>
+					<controls:SortableGridViewColumn Header="Name" SortBy="Name">
+						<controls:SortableGridViewColumn.CellTemplate>
+							<DataTemplate>
+								<StackPanel Orientation="Horizontal">
+									<Image Height="16" Margin="0,0,4,0" Width="16" Source="{Binding Image}" />
+									<TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis" />
+								</StackPanel>
+							</DataTemplate>
+						</controls:SortableGridViewColumn.CellTemplate>
+					</controls:SortableGridViewColumn>
+					<controls:SortableGridViewColumn Header="Location" SortBy="Location">
+						<controls:SortableGridViewColumn.CellTemplate>
+							<DataTemplate>
+								<StackPanel Orientation="Horizontal">
+									<Image Height="16" Margin="4,0,4,0" Width="16" Source="{Binding LocationImage}" />
+									<TextBlock Text="{Binding Location}" TextTrimming="CharacterEllipsis" />
+								</StackPanel>
+							</DataTemplate>
+						</controls:SortableGridViewColumn.CellTemplate>
+					</controls:SortableGridViewColumn>
+				</GridView>
+			</ListView.View>
+		</ListView>
 	</Grid>
 </UserControl>
\ No newline at end of file