diff --git a/TestPlan/InstallAsNew.md b/TestPlan/InstallAsNew.md
new file mode 100644
index 00000000..a789a688
--- /dev/null
+++ b/TestPlan/InstallAsNew.md
@@ -0,0 +1,15 @@
+#Test Plan for Ensuring that Installing as an New Install works properly
+Steps                 | Desired Results                | Complete | Comments
+----------------------|--------------------------------|----------| --------
+Ensure that OpenLiveWriter is not installed.  If it is installed, delete registry keys and local files | |
+||| Registry Keys are at HKEY_CURRENT_USER\Software\OpenLiveWriter
+||| Local files are at %users%\AppData\Local\OpenLiveWriter
+Download build | Setup File should be named OpenLiveWriterSetup.exe |  | 
+Run OpenLiveWriterSetup.exe | See OpenLiveWriter Splash | |
+OpenLiveWriter Opens | User can add a blog | |
+ | Post multiple times with each blog | |
+ | File Tab exists and contains proper options | |
+ | Home Tab exists and contains proper options | |
+ | Insert Tab exists and contains proper options | |
+ | Blog Tab exists and contains proper options | | 
+ | Help Tab exists and contains proper options | |
diff --git a/TestPlan/InstallAsUpdate.md b/TestPlan/InstallAsUpdate.md
new file mode 100644
index 00000000..2bb3773c
--- /dev/null
+++ b/TestPlan/InstallAsUpdate.md
@@ -0,0 +1,16 @@
+#Test Plan for Ensuring that Installing as an Update works properly
+Steps                 | Desired Results                | Complete | Comments
+----------------------|--------------------------------|----------| --------
+Download build | Setup File should be named OpenLiveWriterSetup.exe |  | 
+| See OpenLiveWriter Splash | |
+| OpenLiveWriter Opens ||
+Run Install | OpenLiveWriter opens in Home Tab ||
+ | All existing blogs are present | |
+ |Post multiple times with each blog | |
+ | File Tab exists and contains proper options | |
+ | Home Tab exists and contains proper options | |
+ | Insert Tab exists and contains proper options | |
+ | Blog Tab exists and contains proper options | | 
+ | Help Tab exists and contains proper options | |
+
+
diff --git a/TestPlan/TestProcedures.md b/TestPlan/TestProcedures.md
new file mode 100644
index 00000000..1776876c
--- /dev/null
+++ b/TestPlan/TestProcedures.md
@@ -0,0 +1,13 @@
+### Test Plan Procedures
+* Go to the contributors repository - for example if I am the contributor, go to my repositories and get a copy, either by downloading the zip file or by cloning
+* Build and run the code.  See https://github.com/OpenLiveWriter/OpenLiveWriter/wiki/Building,-Testing,-and-Debugging
+* If you don't need to look at the code, use this procedure;
+  * Go to a pull request
+  * Scroll down to "All check have passed" and click on "Show all checks"
+  * Click on 'Details' link next to 'AppVeyor build succeeded'
+  * You can see the output of the build if it succeeded, click on 'Artifacts'
+  * Find OpenLiveWiterSetup.exe
+  * Download that and run it to install OpenLiveWriter.
+* Attempt to recreate the bug
+* Sanity Test -- I am creating checklists for sanity tests.  Test as many individual things as you possibly can.
+* When you find a problem, document it in the pull request.
diff --git a/src/managed/OpenLiveWriter.PostEditor/WeblogCommandManager.cs b/src/managed/OpenLiveWriter.PostEditor/WeblogCommandManager.cs
index 8baf9b75..59430fcd 100644
--- a/src/managed/OpenLiveWriter.PostEditor/WeblogCommandManager.cs
+++ b/src/managed/OpenLiveWriter.PostEditor/WeblogCommandManager.cs
@@ -102,7 +102,7 @@ namespace OpenLiveWriter.PostEditor
             _editingManager = editingManager;
             _editingManager.BlogChanged += new EventHandler(_editingManager_BlogChanged);
             _editingManager.BlogSettingsChanged += new WeblogSettingsChangedHandler(_editingManager_BlogSettingsChanged);
-
+            
             _editingSite = editingSite;
 
             BlogSettings.BlogSettingsDeleted += new BlogSettings.BlogSettingsListener(BlogSettings_BlogSettingsDeleted);
@@ -114,6 +114,11 @@ namespace OpenLiveWriter.PostEditor
             InitializeUI();
         }
 
+        private void EditingSiteOnWeblogListChanged(object sender, EventArgs eventArgs)
+        {
+            commandSelectBlog?.ReloadAndInvalidate();
+        }
+
         void BlogSettings_BlogSettingsDeleted(string blogId)
         {
             commandSelectBlog.ReloadAndInvalidate();
@@ -130,6 +135,8 @@ namespace OpenLiveWriter.PostEditor
 
             commandWeblogPicker = new CommandWeblogPicker();
             _editingSite.CommandManager.Add(commandWeblogPicker);
+            _editingSite.WeblogListChanged -= EditingSiteOnWeblogListChanged;
+            _editingSite.WeblogListChanged += EditingSiteOnWeblogListChanged;
 
             commandAddWeblog = new Command(CommandId.AddWeblog);
             commandAddWeblog.Execute += new EventHandler(commandAddWeblog_Execute);
@@ -154,7 +161,6 @@ namespace OpenLiveWriter.PostEditor
         {
             if (WeblogSelected != null)
                 WeblogSelected(BlogSettings.GetBlogs(true)[commandSelectBlog.SelectedIndex].Id);
-
         }
 
         private void InitializeUI()