diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index d5f8b4912..3a1cb1825 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -514,7 +514,6 @@
                         </Grid>
                     </Border>
                     <Border
-                        MinHeight="400"
                         MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
                         d:DataContext="{d:DesignInstance vm:ResultViewModel}"
                         DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index c333c4e85..b9d35aae8 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -169,7 +169,6 @@ namespace Flow.Launcher
         {
             // MouseEventHandler
             PreviewMouseMove += MainPreviewMouseMove;
-
             CheckFirstLaunch();
             HideStartup();
             // show notify icon when flowlauncher is hidden
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
index 1fe33b5c0..9cf9e0d45 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
@@ -16,32 +16,38 @@
             <RowDefinition />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" VerticalAlignment="Center">
+        <Grid Grid.Row="0" VerticalAlignment="Center">
+            <Grid.RowDefinitions>
+                <RowDefinition MinHeight="96" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
             <Image
-                Margin="0 16 0 0"
-                Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-                Stretch="Uniform">
+                Grid.Row="0"
+                Margin="0 12 0 0"
+                Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
                 <Image.Style>
                     <Style TargetType="Image">
-                        <Setter Property="MaxWidth" Value="96" />
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding UseBigThumbnail}" Value="True">
-                                <Setter Property="Width" Value="{Binding ElementName=PreviewGrid, Path=ActualWidth}" />
-                                <Setter Property="MaxWidth" Value="{Binding ElementName=PreviewGrid, Path=ActualWidth}" />
+                            <DataTrigger Binding="{Binding UseBigThumbnail}" Value="False">
+                                <Setter Property="MaxWidth" Value="96" />
+                                <Setter Property="MaxHeight" Value="96" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </Image.Style>
             </Image>
-            <TextBlock
-                Margin="0 6 0 16"
-                HorizontalAlignment="Stretch"
-                Style="{DynamicResource PreviewItemTitleStyle}"
-                Text="{Binding Result.Title}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-        </StackPanel>
-        <StackPanel Grid.Row="1">
+            <Grid Grid.Row="1">
+                <TextBlock
+                    Margin="0 6 0 16"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemTitleStyle}"
+                    Text="{Binding Result.Title}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+            </Grid>
+        </Grid>
+        <StackPanel Grid.Row="2">
             <StackPanel.Style>
                 <Style TargetType="StackPanel">
                     <Style.Triggers>