diff --git a/UnityLauncherPro/MainWindow.xaml b/UnityLauncherPro/MainWindow.xaml
index 5e350ec..8cf3e47 100644
--- a/UnityLauncherPro/MainWindow.xaml
+++ b/UnityLauncherPro/MainWindow.xaml
@@ -741,6 +741,7 @@
                                     <CheckBox x:Name="chkFetchAdditionalInfo" Content="Fetch additional info about Editor"  ToolTip="Reads releases API for security related info" Checked="chkFetchAdditionalInfo_Checked" Unchecked="chkFetchAdditionalInfo_Checked"/>
                                     <CheckBox x:Name="chkFetchOnlineTemplates" Content="New Project window: Fetch online templates"  ToolTip="Automatically fetch template listfrom Unity servers" Checked="chkFetchOnlineTemplates_Checked" Unchecked="chkFetchOnlineTemplates_Checked"/>
                                     <CheckBox x:Name="chkStreamerMode" Content="Streamer Mode (hide project names and folders)"  ToolTip="Hide project names and folders in main view" Checked="ChkStreamerMode_Checked" Unchecked="ChkStreamerMode_Checked" HorizontalAlignment="Left"/>
+                                    <CheckBox x:Name="chkShowRecoveredScenePopup" Content="Show popup for recovered scene after editor crash"  ToolTip="After editor crash, show a popup to load recovered scene (or delete it)" Checked="chkShowRecoveredScenePopup_Checked" Unchecked="chkShowRecoveredScenePopup_Checked" HorizontalAlignment="Left"/>
                                     <!--<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
                                 <TextBox x:Name="txtTemplatePackagesFolder" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" ToolTip="Folder for your custom unitypackage templates (for new project)" Padding="0,3,0,0" Width="110" TextChanged="TxtTemplatePackagesFolder_TextChanged" />
                                 <Button Style="{StaticResource CustomButton}" x:Name="btnBrowseTemplateUnityPackagesFolder" Content="..." Margin="6,0,0,0" MinWidth="22" MinHeight="22" FontSize="16" ToolTip="Browse for new projects root folder.." Click="BtnBrowseTemplateUnityPackagesFolder_Click" />
@@ -758,23 +759,23 @@
                                         <CheckBox   x:Name="chkRunAutomatically" Content="Run automatically on startup"  ToolTip="Run automatically using startup registry key" HorizontalAlignment="Left" Checked="ChkRunAutomatically_Checked" Unchecked="ChkRunAutomatically_Checked"/>
                                         <CheckBox   x:Name="chkRunAutomaticallyMinimized" Content="as minimized"  ToolTip="Minimize to tray when started automatically" HorizontalAlignment="Left" Checked="ChkRunAutomaticallyMinimized_Checked" Unchecked="ChkRunAutomaticallyMinimized_Checked" Margin="5,0,0,3"/>
                                     </StackPanel>
-                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,6,0,0">
+                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,-1,0,0">
                                         <Label Content="Initial WebGL server port" Foreground="{DynamicResource ThemeButtonForeground}" />
                                         <TextBox x:Name="txtWebglPort" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}"  MinWidth="80" ToolTip="Initial port for first local WebGL webserver process (next one will be +1)" Padding="0,3,0,0" TextChanged="txtWebglPort_TextChanged" HorizontalAlignment="Left" Text="50000" LostFocus="txtWebglPort_LostFocus" Margin="1,0,0,0" Height="22" />
                                     </StackPanel>
-                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4" HorizontalAlignment="Left">
+                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,-1,0,4" HorizontalAlignment="Left">
                                         <Label Content="Shortcut .bat files folder" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Left" />
                                         <TextBox x:Name="txtShortcutBatchFileFolder" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="169" ToolTip="Save generated .bat files here (they are run from Desktop Shortcut)" Padding="0,3,0,0" HorizontalAlignment="Left" MaxWidth="169" LostFocus="TxtShortcutBatchFileFolder_LostFocus" TextChanged="TxtShortcutBatchFileFolder_TextChanged" Margin="5,0,0,0" Height="22" />
                                         <Button Style="{StaticResource CustomButton}" x:Name="btnBrowseBatchFileFolder" Content="..." Margin="5,0,0,0" MinWidth="22" Click="BtnBrowseBatchFileFolder_Click" MinHeight="22" FontSize="16" ToolTip="Browse for .bat folder (default location is inside AppData/UnityLauncherPro/ and works fine, so this is optional)" HorizontalAlignment="Left" />
                                     </StackPanel>
-                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4" HorizontalAlignment="Left">
-                                        <Label Content="ADB args:" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Margin="0,1,0,-4" />
+                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,-1,0,4" HorizontalAlignment="Left">
+                                        <Label Content="ADB args:" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Margin="0,0,0,-4" />
                                         <TextBox x:Name="txtLogCatArgs" BorderBrush="Transparent" Text="-s Unity ActivityManager PackageManager dalvikvm DEBUG -v color" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="250" ToolTip="ADB commandline arguments" Padding="0,3,0,0" TextChanged="TxtLogCatArgs_TextChanged" Width="250" Height="22" />
                                         <Button Style="{StaticResource CustomButton}" x:Name="btnResetLogCatArgs" Margin="5,0,0,0"  HorizontalAlignment="Left" VerticalAlignment="Top" ToolTip="Reset to default logcat args" Click="BtnResetLogCatArgs_Click">
                                             <Label Content="Reset" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
                                         </Button>
                                     </StackPanel>
-                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,6,0,0">
+                                    <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,-2,0,0">
                                         <Button  x:Name="btnPatchHubConfig" ToolTip="Modifies json file to set 'manual:true' values into 'false', so that can add modules using Hub. NOTE: This cannot be reversed (not keeping track which values were already 'false')" Style="{StaticResource CustomButton}"  HorizontalAlignment="Left" VerticalAlignment="Top"  Click="btnPatchHubConfig_Click">
                                             <Label Content="Patch Hub editors.json" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
                                         </Button>
diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
index f537865..b2d8c52 100644
--- a/UnityLauncherPro/MainWindow.xaml.cs
+++ b/UnityLauncherPro/MainWindow.xaml.cs
@@ -583,6 +583,7 @@ void LoadSettings()
                 chkAskNameForQuickProject.IsChecked = Settings.Default.askNameForQuickProject;
                 chkEnableProjectRename.IsChecked = Settings.Default.enableProjectRename;
                 chkStreamerMode.IsChecked = Settings.Default.streamerMode;
+                chkShowRecoveredScenePopup.IsChecked = Settings.Default.showRecoveredScenePopup;
                 chkShowPlatform.IsChecked = Settings.Default.showTargetPlatform;
                 chkCheckSRP.IsChecked = Settings.Default.checkSRP;
                 chkUseCustomTheme.IsChecked = Settings.Default.useCustomTheme;
@@ -2219,6 +2220,14 @@ private void ChkStreamerMode_Checked(object sender, RoutedEventArgs e)
             SetStatus("Streamer mode " + (isChecked ? "enabled" : "disabled"), MessageType.Info);
         }
 
+        private void chkShowRecoveredScenePopup_Checked(object sender, RoutedEventArgs e)
+        {
+            var isChecked = (bool)((CheckBox)sender).IsChecked;
+
+            Settings.Default.showRecoveredScenePopup = isChecked;
+            Settings.Default.Save();
+        }
+
         private void ChkShowPlatform_Checked(object sender, RoutedEventArgs e)
         {
             if (this.IsActive == false) return; // dont run code on window init
diff --git a/UnityLauncherPro/Properties/Settings.Designer.cs b/UnityLauncherPro/Properties/Settings.Designer.cs
index f71ec5c..d9dafc1 100644
--- a/UnityLauncherPro/Properties/Settings.Designer.cs
+++ b/UnityLauncherPro/Properties/Settings.Designer.cs
@@ -202,6 +202,18 @@ public bool enableProjectRename {
             }
         }
         
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool showRecoveredScenePopup {
+            get {
+                return ((bool)(this["showRecoveredScenePopup"]));
+            }
+            set {
+                this["showRecoveredScenePopup"] = value;
+            }
+        }
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
diff --git a/UnityLauncherPro/Tools.cs b/UnityLauncherPro/Tools.cs
index c6fc9b5..c58fb5d 100644
--- a/UnityLauncherPro/Tools.cs
+++ b/UnityLauncherPro/Tools.cs
@@ -19,6 +19,7 @@
 using System.Windows.Media;
 using System.Windows.Threading;
 using UnityLauncherPro.Helpers;
+using UnityLauncherPro.Properties;
 
 namespace UnityLauncherPro
 {
@@ -410,45 +411,54 @@ static bool CheckCrashBackupScene(string projectPath)
             var recoveryFile = Path.Combine(projectPath, "Temp", "__Backupscenes", "0.backup");
             if (File.Exists(recoveryFile))
             {
-                var result = MessageBox.Show("Crash recovery scene found, do you want to MOVE it into Assets/_Recovery/-folder?", "UnityLauncherPro - Scene Recovery", MessageBoxButton.YesNo, MessageBoxImage.Question);
-                if (result == MessageBoxResult.Yes)
+                if (Settings.Default.showRecoveredScenePopup)
                 {
-                    var restoreFolder = Path.Combine(projectPath, "Assets", "_Recovery");
-                    if (Directory.Exists(restoreFolder) == false)
+                    var result = MessageBox.Show("Crash recovery scene found, do you want to MOVE it into Assets/_Recovery/-folder?", "UnityLauncherPro - Scene Recovery", MessageBoxButton.YesNo, MessageBoxImage.Question);
+                    if (result == MessageBoxResult.Yes)
                     {
-                        Directory.CreateDirectory(restoreFolder);
-                    }
-                    if (Directory.Exists(restoreFolder) == true)
-                    {
-                        Int32 unixTimestamp = (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
-                        var uniqueFileName = "Recovered_Scene" + unixTimestamp + ".unity";
+                        var restoreFolder = Path.Combine(projectPath, "Assets", "_Recovery");
+                        if (Directory.Exists(restoreFolder) == false)
+                        {
+                            Directory.CreateDirectory(restoreFolder);
+                        }
 
-                        try
+                        if (Directory.Exists(restoreFolder) == true)
                         {
-                            File.Move(recoveryFile, Path.Combine(restoreFolder, uniqueFileName));
-                            // remove folder, otherwise unity 6000.2 asks for recovery
-                            Directory.Delete(Path.Combine(projectPath, "Temp", "__Backupscenes"), true);
+                            Int32 unixTimestamp = (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
+                            var uniqueFileName = "Recovered_Scene" + unixTimestamp + ".unity";
+
+                            try
+                            {
+                                File.Move(recoveryFile, Path.Combine(restoreFolder, uniqueFileName));
+                                // remove folder, otherwise unity 6000.2 asks for recovery
+                                Directory.Delete(Path.Combine(projectPath, "Temp", "__Backupscenes"), true);
+
+                                Console.WriteLine("moved file to " + uniqueFileName);
+                            }
+                            catch (IOException)
+                            {
+                                // if move failed, try copy
+                                File.Copy(recoveryFile, Path.Combine(restoreFolder, uniqueFileName));
+                                Console.WriteLine("copied file");
+                            }
 
-                            Console.WriteLine("moved file to " + uniqueFileName);
+                            Console.WriteLine("Recovered crashed scene into: " + restoreFolder);
                         }
-                        catch (IOException)
+                        else
                         {
-                            // if move failed, try copy
-                            File.Copy(recoveryFile, Path.Combine(restoreFolder, uniqueFileName));
-                            Console.WriteLine("copied file");
+                            Console.WriteLine("Error: Failed to create restore folder: " + restoreFolder);
+                            cancelRunningUnity = true;
                         }
-
-                        Console.WriteLine("Recovered crashed scene into: " + restoreFolder);
                     }
-                    else
+                    else if (result == MessageBoxResult.Cancel) // dont do restore, but run Unity
                     {
-                        Console.WriteLine("Error: Failed to create restore folder: " + restoreFolder);
                         cancelRunningUnity = true;
                     }
                 }
-                else if (result == MessageBoxResult.Cancel) // dont do restore, but run Unity
+                else
                 {
-                    cancelRunningUnity = true;
+                    File.Delete(recoveryFile);
+                    Directory.Delete(Path.GetDirectoryName(recoveryFile));
                 }
             }
             return cancelRunningUnity;