diff --git a/src/modules/launcher/PowerLauncher/LauncherControl.xaml b/src/modules/launcher/PowerLauncher/LauncherControl.xaml
index 2a53555bd6..0161ce3efc 100644
--- a/src/modules/launcher/PowerLauncher/LauncherControl.xaml
+++ b/src/modules/launcher/PowerLauncher/LauncherControl.xaml
@@ -26,17 +26,6 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TextBox}">
                         <Grid>
-                            <Border x:Name="border" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="True">
-                                <ScrollViewer x:Name="PART_ContentHost" Background="{TemplateBinding Background}" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
-                                    <ScrollViewer.ContentTemplate>
-                                        <DataTemplate>
-                                            <Grid Background="{Binding Background, ElementName=PART_ContentHost}" RenderOptions.ClearTypeHint="Enabled" TextOptions.TextFormattingMode="Display">
-                                                <ContentPresenter Content="{Binding Path=Content, ElementName=PART_ContentHost}"/>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ScrollViewer.ContentTemplate>
-                                </ScrollViewer>
-                            </Border>
                             <TextBlock Margin="14, 0, 0, 0" Text="{TemplateBinding Tag}">
                                 <TextBlock.Style>
                                     <Style TargetType="{x:Type TextBlock}">
@@ -49,6 +38,17 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
+                            <Border x:Name="border" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="True">
+                                <ScrollViewer x:Name="PART_ContentHost" Background="{TemplateBinding Background}" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                                    <ScrollViewer.ContentTemplate>
+                                        <DataTemplate>
+                                            <Grid Background="{Binding Background, ElementName=PART_ContentHost}" RenderOptions.ClearTypeHint="Enabled" TextOptions.TextFormattingMode="Display">
+                                                <ContentPresenter Content="{Binding Path=Content, ElementName=PART_ContentHost}"/>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ScrollViewer.ContentTemplate>
+                                </ScrollViewer>
+                            </Border>
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsEnabled" Value="false">