diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml
index e50d67fb15..98dd923e3b 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml
@@ -9,6 +9,9 @@
 		<CheckBox Name="featureEnabledCheckBox" DockPanel.Dock="Top"
 		          IsEnabled="False"
 		          IsChecked="True" Content="Enable code inspection" />
+		<TextBlock DockPanel.Dock="Bottom" TextWrapping="WrapWithOverflow" MaxHeight="75"
+		           Text="{Binding SelectedValue.Description, ElementName=listBox}" />
+		<TextBlock FontWeight="Bold" DockPanel.Dock="Bottom" Text="{Binding SelectedValue.Title, ElementName=listBox}" />
 		<sd:RestrictDesiredSize Margin="0, 4, 0, 0">
 			<ListBox Name="listBox"
 			         HorizontalContentAlignment="Stretch"
@@ -17,12 +20,13 @@
 					<DataTemplate>
 						<DockPanel>
 							<ComboBox DockPanel.Dock="Right"
+							          GotFocus="ComboBox_GotFocus"
 							          MinWidth="85"
 							          VerticalAlignment="Center"
 							          gui:EnumBinding.EnumType="{x:Type nr:Severity}"
 							          SelectedValue="{Binding Severity}"/>
 							<sd:RestrictDesiredSize RestrictHeight="False" MinWidth="150">
-								<TextBlock Text="{Binding DisplayName}" ToolTip="{Binding ToolTip}" TextWrapping="WrapWithOverflow" />
+								<TextBlock Text="{Binding Title}" TextWrapping="WrapWithOverflow" VerticalAlignment="Center" />
 							</sd:RestrictDesiredSize>
 						</DockPanel>
 					</DataTemplate>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml.cs
index ff30e38725..df56876e66 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml.cs
@@ -13,6 +13,7 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
+using ICSharpCode.Core.Presentation;
 using ICSharpCode.NRefactory.CSharp;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Refactoring;
@@ -60,5 +61,13 @@ namespace CSharpBinding.Refactoring
 			IssueManager.SetIssueSeveritySettings(dict);
 			return base.SaveOptions();
 		}
+		
+		void ComboBox_GotFocus(object sender, RoutedEventArgs e)
+		{
+			var item = WpfTreeNavigation.TryFindParent<ListBoxItem>((ComboBox)sender);
+			if (item != null) {
+				item.IsSelected = true;
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptionsViewModel.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptionsViewModel.cs
index 2ad0fd48cb..bd23de79e9 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptionsViewModel.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptionsViewModel.cs
@@ -25,11 +25,11 @@ namespace CSharpBinding.Refactoring
 		}
 		
 		// TODO: Translate
-		public string DisplayName {
+		public string Title {
 			get { return attribute.Title; }
 		}
 		
-		public string ToolTip {
+		public string Description {
 			get { return attribute.Description; }
 		}