1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
index f88be41210..f259dfdf67 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -104,11 +104,13 @@ namespace MonoDevelop.Ide.CodeTemplates
 					                                AlertButton.Cancel, AlertButton.Remove) == AlertButton.Remove) {
 						templates.Remove (template);
 						templateStore.Remove (ref selected);
+						templatesToRemove.Add (template);
 					}
 				}
 			}
 		}
 		List<CodeTemplate> templatesToSave = new List<CodeTemplate> ();
+		List<CodeTemplate> templatesToRemove = new List<CodeTemplate> ();
 		void ButtonEditClicked (object sender, EventArgs e)
 		{
 			var template = GetSelectedTemplate ();
@@ -142,8 +144,10 @@ namespace MonoDevelop.Ide.CodeTemplates
 		
 		public void Store ()
 		{
-			templatesToSave.ForEach (template => CodeTemplateService.SaveTemplate (template));
+			templatesToSave.ForEach (CodeTemplateService.SaveTemplate);
 			templatesToSave.Clear ();
+			templatesToRemove.ForEach (CodeTemplateService.DeleteTemplate);
+			templatesToRemove.Clear ();
 			CodeTemplateService.Templates = templates;
 		}