diff --git a/GoToWindow/MainWindow.xaml b/GoToWindow/MainWindow.xaml
index 5514f91..080bd07 100644
--- a/GoToWindow/MainWindow.xaml
+++ b/GoToWindow/MainWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:gotowindow="clr-namespace:GoToWindow"
-        Title="Go To Window" Height="400" Width="640"
+        Title="Go To Window" Height="Auto" Width="640"
         WindowStartupLocation="CenterScreen"
         AllowsTransparency="True"
         Background="Transparent"
@@ -64,7 +64,8 @@
             <ListView Grid.Row="1" Name="windowsListView"
                       ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                       MouseDoubleClick="windowsListView_MouseDoubleClick"
-                      BorderBrush="Transparent">
+                      BorderBrush="Transparent"
+                      MaxHeight="288">
                 <ListView.Style>
                     <Style TargetType="ListView">
                         <Style.Triggers>
@@ -72,8 +73,8 @@
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="ListView">
-                                            <Grid Height="32" >
-                                                <TextBlock Margin="8" VerticalAlignment="Center" Foreground="Gray" Text="No opened windows matching your keywords"/>
+                                            <Grid Height="48" >
+                                                <TextBlock Margin="16" VerticalAlignment="Center" Foreground="Gray" Text="No opened windows matching your keywords"/>
                                             </Grid>
                                         </ControlTemplate>
                                     </Setter.Value>