diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 1f163d363..e1970f5ba 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -344,8 +344,22 @@
                 <ContentControl>
                     <ContentControl.Style>
                         <Style TargetType="ContentControl">
-                            <Setter Property="Visibility" Value="Collapsed" />
+                            <Setter Property="Visibility" Value="Visible" />
                             <Style.Triggers>
+                                <MultiDataTrigger>
+                                    <MultiDataTrigger.Conditions>
+                                        <Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
+                                        <Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
+                                        <Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
+                                    </MultiDataTrigger.Conditions>
+                                    <MultiDataTrigger.Setters>
+                                        <Setter Property="Visibility" Value="Collapsed" />
+                                        <Setter Property="Margin" Value="0" />
+                                        <Setter Property="Height" Value="0" />
+                                    </MultiDataTrigger.Setters>
+                                </MultiDataTrigger>
+                            </Style.Triggers>
+                            <!--<Style.Triggers>
                                 <DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
                                     <Setter Property="Visibility" Value="Visible" />
                                 </DataTrigger>
@@ -355,7 +369,7 @@
                                 <DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
                                     <Setter Property="Visibility" Value="Visible" />
                                 </DataTrigger>
-                            </Style.Triggers>
+                            </Style.Triggers>-->
                         </Style>
                     </ContentControl.Style>
                     <Rectangle
@@ -428,6 +442,7 @@
                 <GridSplitter
                     Grid.Column="1"
                     Width="{Binding PreviewVisible, Converter={StaticResource SplitterConverter}}"
+                    Margin="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Stretch"
                     Background="Transparent"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index b9d35aae8..efeed5148 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -85,15 +85,26 @@ namespace Flow.Launcher
 
         private const int WM_ENTERSIZEMOVE = 0x0231;
         private const int WM_EXITSIZEMOVE = 0x0232;
+        private int _initialWidth;
+        private int _initialHeight;
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             if (msg == WM_ENTERSIZEMOVE)
             {
+                _initialWidth = (int)Width;
+                _initialHeight = (int)Height;
                 handled = true;
             }
             if (msg == WM_EXITSIZEMOVE)
             {
-                OnResizeEnd();
+                if ( _initialHeight != (int)Height)
+                {
+                    OnResizeEnd();
+                }
+                if (_initialWidth != (int)Width)
+                {
+                    FlowMainWindow.SizeToContent = SizeToContent.Height;
+                }
                 handled = true;
             }
             return IntPtr.Zero;
@@ -120,9 +131,8 @@ namespace Flow.Launcher
                     _settings.MaxResultsToShow = Convert.ToInt32(Math.Truncate(itemCount));
                 }
             }
-
-            _viewModel.MainWindowWidth = Width;
             FlowMainWindow.SizeToContent = SizeToContent.Height;
+            _viewModel.MainWindowWidth = Width;
         }
 
         private void OnCopy(object sender, ExecutedRoutedEventArgs e)