diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/InsightWindow.xaml b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/InsightWindow.xaml
index e3bd35caa8..2130926324 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/InsightWindow.xaml
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/InsightWindow.xaml
@@ -78,6 +78,10 @@
 									</Setter>
 								</Style.Setters>
 							</Style>
+						
+							<DataTemplate x:Key="TextBlockTemplate">
+								<TextBlock TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" />
+							</DataTemplate>
 						</Grid.Resources>
 						
 						<Grid.ColumnDefinitions>
@@ -102,16 +106,10 @@
 								<Path Stroke="Black" Fill="Black" Data="M 0,0 L 1,0 L 0.5,0.866 Z" Stretch="UniformToFill" />
 							</Button>
 						</StackPanel>
-						<ContentPresenter Grid.Row="0" Grid.Column="1"
-						                  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Provider.CurrentHeader}"/>
+						<ContentPresenter Grid.Row="0" Grid.Column="1" ContentTemplateSelector="{StaticResource templateSelector}"
+						                  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Provider.CurrentHeader}" />
 						<ContentPresenter Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" ContentTemplateSelector="{StaticResource templateSelector}"
-						                  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Provider.CurrentContent}">
-							<ContentPresenter.Resources>
-								<DataTemplate x:Key="TextBlockTemplate">
-									<TextBlock TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" />
-								</DataTemplate>
-							</ContentPresenter.Resources>
-						</ContentPresenter>
+						                  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Provider.CurrentContent}" />
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>