diff --git a/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml b/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml
index dd2e51a4cd..e5c98023a0 100644
--- a/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml
+++ b/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml
@@ -27,7 +27,7 @@
 			<Label DockPanel.Dock="Left" Target="{Binding ElementName=filterTextBox}">_Search:</Label>
 			<TextBox Name="filterTextBox" TextChanged="FilterTextBox_TextChanged" />
 		</DockPanel>
-		<ListView Name="listView" Grid.Row="1" Margin="0, 8" core:SortableGridViewColumn.SortMode="Automatic" SelectionChanged="ListView_SelectionChanged">
+		<ListView Name="listView" Grid.Row="1" Margin="0, 8" core:SortableGridViewColumn.SortMode="Automatic" SelectionChanged="ListView_SelectionChanged" MouseDoubleClick="ListView_MouseDoubleClick">
 			<ListView.View>
 				<GridView>
 					<core:SortableGridViewColumn x:Name="nameColumn" Width="300" Header="Reference Name" DisplayMemberBinding="{Binding ShortName}" />
diff --git a/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml.cs b/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml.cs
index c9cc9d3a41..380f9ab10a 100644
--- a/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml.cs
+++ b/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml.cs
@@ -173,12 +173,23 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 			okButton.IsEnabled = listView.SelectedItems.Count > 0;
 		}
 
+		void ListView_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+		{
+			// Double click in list = click on OK button
+			ConfirmCurrentSelection();
+		}
+
 		void OKButton_Click(object sender, RoutedEventArgs e)
+		{
+			ConfirmCurrentSelection();
+		}
+		
+		void ConfirmCurrentSelection()
 		{
 			this.DialogResult = true;
 			Close();
 		}
-
+		
 		public string[] SelectedFileNames {
 			get {
 				return listView.SelectedItems.OfType<GacEntry>().Select(e => e.FileName).ToArray();