diff --git a/Songify Slim/MainWindow.xaml b/Songify Slim/MainWindow.xaml
index 51d32576..fbd9b5fa 100644
--- a/Songify Slim/MainWindow.xaml	
+++ b/Songify Slim/MainWindow.xaml	
@@ -9,7 +9,7 @@
                       xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
                       Title="Songify" Height="285" Width="588" Loaded="MetroWindowLoaded"
                       StateChanged="MetroWindowStateChanged" ResizeMode="CanMinimize" Closed="MetroWindowClosed"
-                      ShowDialogsOverTitleBar="False" Closing="MetroWindow_Closing" WindowStartupLocation="Manual">
+                      ShowDialogsOverTitleBar="False" Closing="MetroWindow_Closing" WindowStartupLocation="CenterScreen">
     <controls:MetroWindow.Resources>
         <Style TargetType="{x:Type dialog:MessageDialog}"
                x:Key="NewCustomMessageDialogStyle"
diff --git a/Songify Slim/MainWindow.xaml.cs b/Songify Slim/MainWindow.xaml.cs
index 04f570fd..1273baa6 100644
--- a/Songify Slim/MainWindow.xaml.cs	
+++ b/Songify Slim/MainWindow.xaml.cs	
@@ -684,7 +684,7 @@ private void MetroWindowStateChanged(object sender, EventArgs e)
         {
             // if the window state changes to minimize check run MinimizeToSysTray()
             if (WindowState != WindowState.Minimized) return;
-            MinimizeToSysTray();
+            if (Settings.Systray) MinimizeToSysTray();
         }
 
         private void Mi_Blacklist_Click(object sender, RoutedEventArgs e)