diff --git a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
index 47ef9cb748..6437036848 100644
--- a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
+++ b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
@@ -58,25 +58,26 @@
                         <Image x:Name="AppIcon" Height="36" Margin="8,0,0,0" Grid.RowSpan="2" HorizontalAlignment="Left" Source="{Binding Image}" />
                         <TextBlock x:Name="Title" Grid.Column="1" Text="{Binding Result.Title}" FontWeight="SemiBold" FontSize="20" VerticalAlignment="Bottom"/>
                         <TextBlock x:Name="Path" Grid.Column="1" Text= "{Binding Result.SubTitle}" Grid.Row="1" Opacity="0.6" VerticalAlignment="Top"/>
-                        <ListView  Opacity="0" 
+                        <GridView 
                                    HorizontalAlignment="Right" 
+                                   VerticalAlignment="Center"
+                                   CornerRadius="4"
                                    Grid.RowSpan="2" 
-                                   Grid.Column="1" 
+                                   Grid.Column="1"
+                                   Margin="0,0,42,0"
+                                   Height="46"
+                                   ScrollViewer.IsVerticalRailEnabled="False"
                                    ItemsSource="{Binding ContextMenuItems}" 
                                    SelectionMode="Single"
                                    SelectedIndex="{Binding ContextMenuSelectedIndex}">
-                            <ListView.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <StackPanel Orientation="Horizontal"/>
-                                </ItemsPanelTemplate>
-                            </ListView.ItemsPanel>
+
                             <Interactivity:Interaction.Behaviors>
                                 <ToolkitBehaviors:Fade x:Name="ShowActionButtons" Duration="250" Delay="0" AutomaticallyStart="False" Value="1" />
                                 <ToolkitBehaviors:Fade x:Name="HideActionsButtons" Duration="250" Delay="0" AutomaticallyStart="False" Value="0" />
                             </Interactivity:Interaction.Behaviors>
-                            <ListView.ItemTemplate>
+                            <GridView.ItemTemplate>
                                 <DataTemplate>
-                                    <Button Command="{Binding Command}" Background="Transparent" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource ButtonRevealStyle}">
+                                    <Button Command="{Binding Command}" VerticalAlignment="Center" CornerRadius="4" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource ButtonRevealStyle}">
                                         <ToolTipService.ToolTip>
                                             <TextBlock Text="{Binding Title}"/>
                                         </ToolTipService.ToolTip>
@@ -92,8 +93,8 @@
                                         </Button.KeyboardAccelerators>
                                     </Button>
                                 </DataTemplate>
-                            </ListView.ItemTemplate>
-                        </ListView>
+                            </GridView.ItemTemplate>
+                        </GridView>
                     </Grid>
                 </DataTemplate>
             </ListView.ItemTemplate>