diff --git a/Client/Controls/Options.xaml b/Client/Controls/Options.xaml
index 5f9617d5..d30990b3 100644
--- a/Client/Controls/Options.xaml
+++ b/Client/Controls/Options.xaml
@@ -20,7 +20,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="23"/>
-                <RowDefinition Height="46"/>
+                <RowDefinition Height="55"/>
                 <RowDefinition Height="23"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -31,7 +31,10 @@
             <Label Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" Content="Archive File" />
             <TextBox Grid.Row="0" Grid.Column="1" Name="tbArchiveFile" />
             <Button Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" Content="Select..." Name="button1" Click="button1_Click" />
-            <CheckBox Grid.Row="1" Grid.Column="1" Content="Automatically archive completed tasks" Name="cbAutoArchive" />
+            <StackPanel Grid.Row="1" Grid.Column="1">
+                <CheckBox Content="Automatically archive completed tasks" Name="cbAutoArchive" />
+                <CheckBox Content="Automatically select archive path" Name="cbAutoSelectArchivePath" />
+            </StackPanel>
             <Label Grid.Row="2" Grid.Column="0" Content="Current Font" />
             <TextBox Grid.Row="2" Grid.Column="1" Name="currentFontDisplay" IsUndoEnabled="False" IsReadOnly="True" />
             <Button Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right" Content="Select Font..." Name="selectFonts" Click="selectFonts_Click" />
diff --git a/Client/Controls/Options.xaml.cs b/Client/Controls/Options.xaml.cs
index c7ec9b3a..04e02b57 100644
--- a/Client/Controls/Options.xaml.cs
+++ b/Client/Controls/Options.xaml.cs
@@ -26,6 +26,7 @@ public Options(FontInfo taskFont)
 
             tbArchiveFile.Text = User.Default.ArchiveFilePath;
             cbAutoArchive.IsChecked = User.Default.AutoArchive;
+            cbAutoSelectArchivePath.IsChecked = User.Default.AutoSelectArchivePath;
             cbAutoRefresh.IsChecked = User.Default.AutoRefresh;
             cbCaseSensitiveFilter.IsChecked = User.Default.FilterCaseSensitive;
             cbIntellisenseCaseSensitive.IsChecked = User.Default.IntellisenseCaseSensitive;
diff --git a/Client/MainWindowViewModel.cs b/Client/MainWindowViewModel.cs
index cacfb463..fe9f6f38 100644
--- a/Client/MainWindowViewModel.cs
+++ b/Client/MainWindowViewModel.cs
@@ -1212,12 +1212,12 @@ public void OpenFile()
         
         public void ArchiveCompleted()
         {
-            if (!File.Exists(User.Default.ArchiveFilePath))
+            if (!File.Exists(User.Default.SelectedArchiveFilePath))
             {
                 ShowOptionsDialog();
             }
 
-            if (!File.Exists(User.Default.ArchiveFilePath))
+            if (!File.Exists(User.Default.SelectedArchiveFilePath))
             {
                 return;
             }
@@ -1226,7 +1226,7 @@ public void ArchiveCompleted()
             
             DisableFileChangeObserver();
 
-            var archiveList = new TaskList(User.Default.ArchiveFilePath, User.Default.PreserveWhiteSpace);
+            var archiveList = new TaskList(User.Default.SelectedArchiveFilePath, User.Default.PreserveWhiteSpace);
             var completed = TaskList.Tasks.Where(t => t.Completed);
             
             // Make sure we are working with the latest version of the file.
@@ -1275,6 +1275,7 @@ public void ShowOptionsDialog()
 
             User.Default.ArchiveFilePath = o.tbArchiveFile.Text;
             User.Default.AutoArchive = o.cbAutoArchive.IsChecked.Value;
+            User.Default.AutoSelectArchivePath = o.cbAutoSelectArchivePath.IsChecked.Value;
             User.Default.MoveFocusToTaskListAfterAddingNewTask = o.cbMoveFocusToTaskListAfterAddingNewTask.IsChecked.Value;
             User.Default.AutoRefresh = o.cbAutoRefresh.IsChecked.Value;
             User.Default.FilterCaseSensitive = o.cbCaseSensitiveFilter.IsChecked.Value;
diff --git a/Client/User.Designer.cs b/Client/User.Designer.cs
index e5904151..4cda4c0e 100644
--- a/Client/User.Designer.cs
+++ b/Client/User.Designer.cs
@@ -454,5 +454,17 @@ public bool IntellisenseCaseSensitive {
                 this["IntellisenseCaseSensitive"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool AutoSelectArchivePath {
+            get {
+                return ((bool)(this["AutoSelectArchivePath"]));
+            }
+            set {
+                this["AutoSelectArchivePath"] = value;
+            }
+        }
     }
 }
diff --git a/Client/User.cs b/Client/User.cs
index e33ddd79..479da996 100644
--- a/Client/User.cs
+++ b/Client/User.cs
@@ -1,4 +1,6 @@
-namespace Client 
+using System.IO;
+
+namespace Client 
 {      
     // This class allows you to handle specific events on the settings class:
     //  The SettingChanging event is raised before a setting's value is changed.
@@ -26,5 +28,16 @@ private void SettingsSavingEventHandler(object sender, System.ComponentModel.Can
         {
             // Add code to handle the SettingsSaving event here.
         }
+
+        public string SelectedArchiveFilePath
+        {
+            get
+            {
+                return
+                    AutoSelectArchivePath
+                    ? Path.Combine(Path.GetDirectoryName(FilePath), "done.txt")
+                    : ArchiveFilePath;
+            }
+        }
     }
 }
diff --git a/Client/User.settings b/Client/User.settings
index 9d91be5a..3225118d 100644
--- a/Client/User.settings
+++ b/Client/User.settings
@@ -110,5 +110,8 @@
     <Setting Name="IntellisenseCaseSensitive" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="AutoSelectArchivePath" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Client/app.config b/Client/app.config
index 782c5e69..581cf757 100644
--- a/Client/app.config
+++ b/Client/app.config
@@ -115,6 +115,9 @@
             <setting name="IntellisenseCaseSensitive" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="AutoSelectArchivePath" serializeAs="String">
+                <value>False</value>
+            </setting>
         </Client.User>
     </userSettings>
 </configuration>
\ No newline at end of file