diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 350ef018e..072196605 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -16,7 +16,6 @@
          Style="{DynamicResource BaseListboxStyle}" Focusable="False"
          KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
          VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard"
-         ScrollViewer.IsDeferredScrollingEnabled="True"
          SelectionChanged="OnSelectionChanged"
          IsSynchronizedWithCurrentItem="True"
          PreviewMouseDown="ListBox_PreviewMouseDown">
@@ -30,20 +29,26 @@
                     </ControlTemplate>
                 </Button.Template>
                 <Button.Content>
-                    <VirtualizingStackPanel Orientation="Horizontal" Margin="5,0,5,0">
-                        <VirtualizingStackPanel.Resources>
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5"
+                          Cursor="Hand" UseLayoutRounding="False">
+                        <Grid.Resources>
                             <converter:HighlightTextConverter x:Key="HighlightTextConverter"/>
                             <converter:OrdinalConverter x:Key="OrdinalConverter" />
                             <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
-                        </VirtualizingStackPanel.Resources>
+                        </Grid.Resources>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="32" />
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="0" />
+                        </Grid.ColumnDefinitions>
                         <Image x:Name="ImageIcon" Width="32" Height="32" HorizontalAlignment="Left"
                                Source="{Binding Image.Value}" />
-                        <Grid Margin="5 0 5 0" HorizontalAlignment="Stretch">
+                        <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
                             </Grid.RowDefinitions>
-                            <VirtualizingStackPanel Visibility="{Binding ShowOpenResultHotkey}">
+                            <StackPanel Visibility="{Binding ShowOpenResultHotkey}">
                                 <TextBlock Margin="0 5 5 0" Style="{DynamicResource ItemSubTitleStyle}" HorizontalAlignment="Right" Opacity="0.8" >
                                     <TextBlock.Visibility>
                                         <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" />
@@ -55,7 +60,7 @@
                                         </MultiBinding>
                                     </TextBlock.Text>
                                 </TextBlock>
-                            </VirtualizingStackPanel>
+                            </StackPanel>
                             <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
                                        VerticalAlignment="Center" ToolTip="{Binding ShowTitleToolTip}" x:Name="Title"
                                        Text="{Binding Result.Title}">
@@ -76,7 +81,7 @@
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
                         </Grid>
-                    </VirtualizingStackPanel>
+                    </Grid>
                 </Button.Content>
             </Button>
             <!-- a result item height is 50 including margin -->