Merge remote-tracking branch 'origin/master' into roslyn

Conflicts:
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
	main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
	main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
	main/src/addins/NUnit/Services/NUnitService.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs

80 files changed, 264 insertions, 169 deletions

diff --git a/main/external/debugger-libs b/main/external/debugger-libs
-Subproject b32b9fcc8be9fb7e82af3724b78d25e211bcfc3
+Subproject bcc2326ad841c64e9ae79dac00dea78f16eaad5
diff --git a/main/src/addins/AspNet/Commands/AddViewDialog.cs b/main/src/addins/AspNet/Commands/AddViewDialog.cs
index 108c8e062a..44bc8e2c06 100644
--- a/main/src/addins/AspNet/Commands/AddViewDialog.cs
+++ b/main/src/addins/AspNet/Commands/AddViewDialog.cs
@@ -347,6 +347,7 @@ namespace MonoDevelop.AspNet.Commands
 					masterEntry.Text = aspFlavor.LocalToVirtualPath (dialog.SelectedFile.FilePath);
 			} finally {
 				dialog.Destroy ();
+				dialog.Dispose ();
 			}
 		}
 		
diff --git a/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs b/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
index ed0bd44867..2c437a46ba 100644
--- a/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
+++ b/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
@@ -116,8 +116,10 @@ namespace MonoDevelop.AspNet.Commands
 			} finally {

 				if (host != null)

 					host.Dispose ();

-				if (dialog != null)

+				if (dialog != null) {

 					dialog.Destroy ();

+					dialog.Dispose ();

+				}

 			}

 

 			if (System.IO.File.Exists (outputFile)) {

diff --git a/main/src/addins/AspNet/Html/HtmlPathCompletion.cs b/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
index 4bbd0a0d64..76493955a1 100644
--- a/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
+++ b/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
@@ -128,6 +128,7 @@ namespace MonoDevelop.AspNet.Html
 				}
 				finally {
 					dialog.Destroy ();
+					dialog.Dispose ();
 				}
 				window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, "", text);
 			}
diff --git a/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs b/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs
index b1a362a074..bcbab2276b 100644
--- a/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs
+++ b/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs
@@ -115,8 +115,10 @@ namespace MonoDevelop.AspNet.ProjectPad
 			} finally {

 				if (host != null)

 					host.Dispose ();

-				if (dialog != null)

+				if (dialog != null) {

 					dialog.Destroy ();

+					dialog.Dispose ();

+				}

 			}

 

 			if (System.IO.File.Exists (outputFile)) {

diff --git a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
index bfddc3f43c..12f658bb6b 100644
--- a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
+++ b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
@@ -61,6 +61,7 @@ namespace MonoDevelop.AspNet.WebForms
 					masterPage = dialog.SelectedFile;
 			} finally {
 				dialog.Destroy ();
+				dialog.Dispose ();
 			}
 			if (masterPage == null)
 				return;
diff --git a/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs b/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs
index 733c3b8597..9e2906f58b 100644
--- a/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs
+++ b/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs
@@ -122,8 +122,9 @@ namespace CBinding.ProjectPad
 		{
 			CProject project = (CProject)CurrentNode.GetParentDataItem (
 			    typeof(CProject), false);
-			
-			MessageService.ShowCustomDialog (new EditPackagesDialog (project));
+
+			using (var dlg = new EditPackagesDialog (project))
+				MessageService.ShowCustomDialog (dlg);
 			
 			IdeApp.ProjectOperations.SaveAsync (project);
 			CurrentNode.Expanded = true;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
index eab826da69..f26821ec2d 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
@@ -194,15 +194,12 @@ namespace MonoDevelop.CSharp.ClassOutline
 				TooltipText = GettextCatalog.GetString ("Open preferences dialog"),
 			};
 			preferencesButton.Clicked += delegate {
-				var dialog = new OutlineSortingPreferencesDialog (settings);
-				try {
-					if (MessageService.ShowCustomDialog (dialog) == (int)ResponseType.Ok) {
+				using (var dialog = new OutlineSortingPreferencesDialog (settings)) {
+					if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog) == (int)Gtk.ResponseType.Ok) {
 						dialog.SaveSettings ();
 						comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
 						UpdateSorting ();
 					}
-				} finally {
-					dialog.Destroy ();
 				}
 			};
 			
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs
index f4da2ff9ba..a5e8616ce9 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs
@@ -104,11 +104,12 @@ namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 		{
 			var newRule = new NameConventionRule ();
 			newRule.Name = "New Rule";
-			var diag = new NameConventionEditRuleDialog (newRule);
-			var result = MessageService.ShowCustomDialog (diag);
-			if (result == (int)ResponseType.Ok)
-				treeStore.AppendValues (newRule);
-			OnPolicyChanged (EventArgs.Empty);
+			using (var diag = new NameConventionEditRuleDialog (newRule)) {
+				var result = MessageService.ShowCustomDialog (diag);
+				if (result == (int)ResponseType.Ok)
+					treeStore.AppendValues (newRule);
+				OnPolicyChanged (EventArgs.Empty);
+			}
 		}
 
 		void EditSelectedEntry ()
@@ -117,11 +118,12 @@ namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
 			if (!treeviewConventions.Selection.GetSelected (out iter))
 				return;
 			var rule = treeStore.GetValue (iter, 0) as NameConventionRule;
-			var diag = new NameConventionEditRuleDialog (rule);
-			int result = MessageService.ShowCustomDialog (diag);
-			treeviewConventions.QueueResize ();
-			if (result == (int)Gtk.ResponseType.Ok) 
-				OnPolicyChanged (EventArgs.Empty);
+			using (var diag = new NameConventionEditRuleDialog (rule)) {
+				int result = MessageService.ShowCustomDialog (diag);
+				treeviewConventions.QueueResize ();
+				if (result == (int)Gtk.ResponseType.Ok)
+					OnPolicyChanged (EventArgs.Empty);
+			}
 		}
 		
 		void RemoveSelectedEntry ()
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
index 6c6462854f..3094571e03 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
@@ -95,9 +95,8 @@ namespace Example {
 
 		void HandleButtonEditClicked (object sender, EventArgs e)
 		{
-			var editDialog = new CSharpFormattingProfileDialog (policy);
-			MessageService.ShowCustomDialog (editDialog);
-			editDialog.Destroy ();
+			using (var editDialog = new CSharpFormattingProfileDialog (policy))
+				MessageService.ShowCustomDialog (editDialog);
 		}
 	}
 }
diff --git a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
index 3b7d78f0b9..c2831dfbfe 100644
--- a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
+++ b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
@@ -286,8 +286,8 @@ namespace MonoDevelop.ChangeLogAddIn
 				return;
 			}
 			
-			var dlg = new AddLogEntryDialog (entries);
-			MessageService.ShowCustomDialog (dlg, (Window) Toplevel);
+			using (var dlg = new AddLogEntryDialog (entries))
+				MessageService.ShowCustomDialog (dlg, (Window) Toplevel);
 		}
 		
 		void OnClickOptions (object s, EventArgs args)
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs
index bda4d65e6c..8e0bd4cadc 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs
@@ -235,6 +235,7 @@ namespace MonoDevelop.Deployment.Linux
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
index 01cf8485c4..175c6b5905 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
@@ -45,6 +45,7 @@ namespace MonoDevelop.Deployment
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 		
@@ -67,6 +68,7 @@ namespace MonoDevelop.Deployment
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 		
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
index 74fab9ef93..d3ee220353 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
@@ -18,6 +18,7 @@ namespace MonoDevelop.Deployment.Gui
 						DeployService.Install (mon, entry, dlg.Prefix, dlg.AppName, configuration);
 				} finally {
 					dlg.Destroy ();
+					dlg.Dispose ();
 				}
 			}
 		}
@@ -51,9 +52,10 @@ namespace MonoDevelop.Deployment.Gui
 		
 		public static void ShowPackageSettings (Package package)
 		{
-			EditPackageDialog dlg = new EditPackageDialog (package);
-			if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok)
-				IdeApp.ProjectOperations.SaveAsync (package.ParentProject);
+			using (EditPackageDialog dlg = new EditPackageDialog (package)) {
+				if (MessageService.ShowCustomDialog (dlg) == (int)Gtk.ResponseType.Ok)
+					IdeApp.ProjectOperations.SaveAsync (package.ParentProject);
+			}
 		}
 	}
 }
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs
index 009cb2e770..3d9f2fda4e 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs
@@ -59,8 +59,8 @@ namespace MonoDevelop.Deployment.Gui
 			//IFileReplacePolicy is not likely to be running in the GUI thread
 			//so use some DispatchService magic to synchronously call the dialog in the GUI thread
 			DispatchService.GuiSyncDispatch (delegate {
-				var dialog = new FileReplaceDialog (response, source, sourceModified.ToString (), target, targetModified.ToString ());
-				response = (FileReplaceDialog.ReplaceResponse) MessageService.ShowCustomDialog (dialog);
+				using (var dialog = new FileReplaceDialog (response, source, sourceModified.ToString (), target, targetModified.ToString ()))
+					response = (FileReplaceDialog.ReplaceResponse) MessageService.ShowCustomDialog (dialog);
 			});
 			
 			switch (response) {
diff --git a/main/src/addins/MonoDevelop.Autotools/Commands.cs b/main/src/addins/MonoDevelop.Autotools/Commands.cs
index d553c16ac0..556ed2fc07 100644
--- a/main/src/addins/MonoDevelop.Autotools/Commands.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Commands.cs
@@ -90,6 +90,7 @@ namespace MonoDevelop.Autotools
 				deployer.GenerateFiles (ctx, solution, dialog.DefaultConfiguration, monitor);
 			} finally {
 				dialog.Destroy ();
+				dialog.Dispose ();
 				if (ctx != null)
 					ctx.Dispose ();
 				if (monitor != null)
diff --git a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
index 0ef6aaaf30..cbfea0d795 100644
--- a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
@@ -80,9 +80,10 @@ namespace MonoDevelop.Autotools
 
 		protected virtual void OnAutofooPropertiesClicked (object sender, System.EventArgs e)
 		{
-			MakefileSwitchEditor editor = new MakefileSwitchEditor (target);
-			editor.ShowAll ();
-			MonoDevelop.Ide.MessageService.ShowCustomDialog (editor, this.Toplevel as Gtk.Window);
+			using (MakefileSwitchEditor editor = new MakefileSwitchEditor (target)) {
+				editor.ShowAll ();
+				MonoDevelop.Ide.MessageService.ShowCustomDialog (editor, this.Toplevel as Gtk.Window);
+			}
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
index 7dcc9a33f1..f4b913b0e9 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
@@ -181,6 +181,7 @@ namespace MonoDevelop.Debugger
 
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 
 
@@ -224,6 +225,7 @@ namespace MonoDevelop.Debugger
 			}
 			finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index b3d178c847..741a970ac9 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -249,9 +249,10 @@ namespace MonoDevelop.Debugger
 		
 		public static void ShowValueVisualizer (ObjectValue val)
 		{
-			var dlg = new ValueVisualizerDialog ();
-			dlg.Show (val);
-			MessageService.ShowCustomDialog (dlg);
+			using (var dlg = new ValueVisualizerDialog ()) {
+				dlg.Show (val);
+				MessageService.ShowCustomDialog (dlg);
+			}
 		}
 
 		public static void ShowPreviewVisualizer (ObjectValue val, MonoDevelop.Components.Control widget, Gdk.Rectangle previewButtonArea)
@@ -321,12 +322,12 @@ namespace MonoDevelop.Debugger
 
 		public static void ShowExpressionEvaluator (string expression)
 		{
-			var dlg = new ExpressionEvaluatorDialog ();
-
-			if (expression != null)
-				dlg.Expression = expression;
+			using (var dlg = new ExpressionEvaluatorDialog ()) {
+				if (expression != null)
+					dlg.Expression = expression;
 
-			MessageService.ShowCustomDialog (dlg);
+				MessageService.ShowCustomDialog (dlg);
+			}
 		}
 
 		public static void ShowExceptionCaughtDialog ()
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
index 0d9bd5d71d..d8bc6c0290 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
@@ -584,8 +584,8 @@ namespace MonoDevelop.Debugger
 		public void ShowDialog ()
 		{
 			if (dialog == null) {
-				dialog = new ExceptionCaughtDialog (ex, this);
-				MessageService.ShowCustomDialog (dialog, IdeApp.Workbench.RootWindow);
+				using (dialog = new ExceptionCaughtDialog (ex, this))
+					MessageService.ShowCustomDialog (dialog, IdeApp.Workbench.RootWindow);
 				dialog = null;
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
index 178aafd0bf..0d802499f4 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
@@ -125,9 +125,10 @@ namespace MonoDevelop.DesignerSupport
 		
 		public void AddUserItems ()
 		{
-			ComponentSelectorDialog dlg = new ComponentSelectorDialog (currentConsumer);
-			dlg.Fill ();
-			MessageService.ShowCustomDialog (dlg);
+			using (ComponentSelectorDialog dlg = new ComponentSelectorDialog (currentConsumer)) {
+				dlg.Fill ();
+				MessageService.ShowCustomDialog (dlg);
+			}
 		}
 		
 		void AddUserItems (IList<ItemToolboxNode> nodes)
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
index d0fbe6ce3e..040f2037c4 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
@@ -122,7 +122,9 @@ namespace MonoDevelop.Gettext.NodeBuilders
 				TranslationProject project = CurrentNode.DataItem as TranslationProject;
 				if (project == null)
 					return;
-				MessageService.ShowCustomDialog (new TranslationProjectOptionsDialog (project));
+				
+				using (var dlg = new TranslationProjectOptionsDialog (project))
+					MessageService.ShowCustomDialog (dlg);
 				IdeApp.Workspace.SaveAsync ();
 			}
 			
@@ -153,6 +155,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 					
 				} finally {
 					chooser.Destroy ();
+					chooser.Dispose ();
 				}
 			}
 			static Task currentUpdateTranslationOperation = Task.FromResult (0);
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
index c103ee2939..00d5f9ded3 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
@@ -59,6 +59,7 @@ namespace MonoDevelop.Gettext
 					}
 				} finally {
 					chooser.Destroy ();
+					chooser.Dispose ();
 				}
 			};
 			this.buttonRemove.Sensitive = false;
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
index f840065952..953295bfcb 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
@@ -178,7 +178,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		
 		public void Dispose ()
 		{
-			dialog.Destroy ();
+			dialog.Dispose ();
 		}
 	}
 	
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
index ae23733dde..de6b5ecbc3 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
@@ -63,7 +63,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		
 		public void Dispose ()
 		{
-			dialog.Destroy ();
+			dialog.Dispose ();
 		}
 		
 		public int Run ()
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
index c201ac0063..0b74290fe3 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
@@ -88,7 +88,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		
 		public void Dispose ()
 		{
-			dialog.Destroy ();
+			dialog.Dispose ();
 		}
 	}
 	
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs
index e509d351ec..ff92a2f132 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs
@@ -40,8 +40,8 @@ namespace MonoDevelop.PackageManagement.Commands
 			try {

 				var viewModels = new PackageManagementViewModels ();

 				IPackageManagementEvents packageEvents = PackageManagementServices.PackageManagementEvents;

-				var dialog = new ManagePackagesDialog (viewModels.ManagePackagesViewModel, packageEvents);

-				MessageService.ShowCustomDialog (dialog);

+				using (var dialog = new ManagePackagesDialog (viewModels.ManagePackagesViewModel, packageEvents))

+					MessageService.ShowCustomDialog (dialog);

 			} catch (Exception ex) {

 				LoggingService.LogInternalError (ex);

 			}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs
index 443d95799c..82c7dcae77 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs
@@ -38,9 +38,10 @@ namespace ICSharpCode.PackageManagement
 	{

 		public bool AcceptLicenses(IEnumerable<IPackage> packages)

 		{

-			LicenseAcceptanceDialog dialog = CreateLicenseAcceptanceDialog(packages);

-			int result = MessageService.ShowCustomDialog(dialog);

-			return result == (int)Gtk.ResponseType.Ok;

+			using (LicenseAcceptanceDialog dialog = CreateLicenseAcceptanceDialog (packages)) {

+				int result = MessageService.ShowCustomDialog (dialog);

+				return result == (int)Gtk.ResponseType.Ok;

+			}

 		}

 		

 		LicenseAcceptanceDialog CreateLicenseAcceptanceDialog(IEnumerable<IPackage> packages)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs
index 1972cb8a03..3042569412 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs
@@ -37,9 +37,10 @@ namespace ICSharpCode.PackageManagement
 	{

 		public bool SelectProjects(IEnumerable<IPackageManagementSelectedProject> projects)

 		{

-			SelectProjectsDialog dialog = CreateSelectProjectsDialog(projects);

-			int result = MessageService.ShowCustomDialog(dialog);

-			return result == (int)Gtk.ResponseType.Ok;

+			using (SelectProjectsDialog dialog = CreateSelectProjectsDialog (projects)) {

+				int result = MessageService.ShowCustomDialog (dialog);

+				return result == (int)Gtk.ResponseType.Ok;

+			}

 		}

 		

 		SelectProjectsDialog CreateSelectProjectsDialog(IEnumerable<IPackageManagementSelectedProject> projects)

diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
index 142643b508..15471b44fa 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
@@ -118,11 +118,12 @@ namespace MonoDevelop.AnalysisCore.Fixes
 					//Refactoring.RunInplace (Options);
 					return;
 				}
-				
+
 //				//FIXME: performchanges should probably use a monitor too, as it can be slow
 //				var changes = Refactoring.PerformChanges (Options, Properties);
 //				if (Preview) {
-//					MessageService.ShowCustomDialog (new RefactoringPreviewDialog (changes));
+//				using (var dlg = new RefactoringPreviewDialog (changes))
+//					MessageService.ShowCustomDialog (dlg);
 //				} else {
 //					var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Rename", null);
 //					RefactoringService.AcceptChanges (monitor, changes);
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
index b7ebeae5d1..2be6d14413 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
@@ -191,7 +191,8 @@ namespace MonoDevelop.Refactoring.Rename
 			var properties = Properties;
 			((Widget)this).Destroy ();
 			var changes = this.rename (properties);
-			MessageService.ShowCustomDialog (new RefactoringPreviewDialog (changes));
+			using (var dlg = new RefactoringPreviewDialog (changes))
+				MessageService.ShowCustomDialog (dlg);
 		}
 	}
 		
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
index 517b67146f..9fcfa006e2 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
@@ -90,14 +90,16 @@ namespace MonoDevelop.Refactoring.Rename
 			var projectChanges = currentSolution.GetChanges (newSolution).GetProjectChanges ().ToList ();
 
 			if (projectChanges.Count != 1) {
-				MessageService.ShowCustomDialog (new RenameItemDialog (symbol, this));
+				using (var dlg = new RenameItemDialog (symbol, this))
+					MessageService.ShowCustomDialog (dlg);
 				return;
 			}
 
 			var projectChange = projectChanges [0];
 			var changes = projectChange.GetChangedDocuments ().ToList ();
 			if (changes.Count != 1 || symbol.Kind == SymbolKind.NamedType) {
-				MessageService.ShowCustomDialog (new RenameItemDialog (symbol, this));
+				using (var dlg = new RenameItemDialog (symbol, this))
+					MessageService.ShowCustomDialog (dlg);
 				return;
 			}
 			var doc = IdeApp.Workbench.ActiveDocument;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
index 36501476a2..66de89fd02 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
@@ -83,8 +83,9 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 
 		void HandleButtonNewClicked (object sender, EventArgs e)
 		{
-			var newShemeDialog = new NewColorShemeDialog ();
-			MessageService.ShowCustomDialog (newShemeDialog, dialog);
+			using (var newShemeDialog = new NewColorShemeDialog ()) {
+				MessageService.ShowCustomDialog (newShemeDialog, dialog);
+			}
 			ShowStyles ();
 		}
 
@@ -113,10 +114,11 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			TreeIter selectedIter;
 			if (styleTreeview.Selection.GetSelected (out selectedIter)) {
-				var editor = new ColorShemeEditor (this);
-				var colorScheme = (Mono.TextEditor.Highlighting.ColorScheme)this.styleStore.GetValue (selectedIter, 1);
-				editor.SetSheme (colorScheme);
-				MessageService.ShowCustomDialog (editor, dialog);
+				using (var editor = new ColorShemeEditor (this)) {
+					var colorScheme = (Mono.TextEditor.Highlighting.ColorScheme)this.styleStore.GetValue (selectedIter, 1);
+					editor.SetSheme (colorScheme);
+					MessageService.ShowCustomDialog (editor, dialog);
+				}
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
index 1d4056f69d..8877b2d292 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
@@ -52,6 +52,7 @@ namespace MonoDevelop.WebReferences.Commands
 				MessageService.ShowError ("The web reference could not be added", exception);
 			} finally {
 				dialog.Destroy ();
+				dialog.Dispose ();
 			}
 		}
 
@@ -199,6 +200,7 @@ namespace MonoDevelop.WebReferences.Commands
 				LoggingService.LogInternalError (exception);
 			} finally {
 				dialog.Destroy ();
+				dialog.Dispose ();
 			}
 		}
 	}	
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
index 9feda476cf..e3c4f90232 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
@@ -652,6 +652,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 				return null;
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 	}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
index a443b57119..062548128f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
@@ -179,6 +179,7 @@ namespace MonoDevelop.VersionControl.Git
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
index 632f1a26d0..eb5035ecf0 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
@@ -104,6 +104,7 @@ namespace MonoDevelop.VersionControl.Git
 							return false;
 					} finally {
 						dlg.Destroy ();
+						dlg.Dispose ();
 					}
 				}
 
@@ -127,6 +128,7 @@ namespace MonoDevelop.VersionControl.Git
 							return false;
 					} finally {
 						dlg.Destroy ();
+						dlg.Dispose ();
 					}
 				}
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
index eff6a2683a..42cc54c9f9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
@@ -167,6 +167,7 @@ namespace MonoDevelop.VersionControl.Git
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -191,6 +192,7 @@ namespace MonoDevelop.VersionControl.Git
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -233,6 +235,7 @@ namespace MonoDevelop.VersionControl.Git
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -259,6 +262,7 @@ namespace MonoDevelop.VersionControl.Git
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -310,6 +314,7 @@ namespace MonoDevelop.VersionControl.Git
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
index c253d12acb..0c23113c5d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
@@ -125,7 +125,8 @@ namespace MonoDevelop.VersionControl.Git
 
 						if (KeyHasPassphrase (dlg.SelectedFile)) {
 							DispatchService.GuiSyncDispatch (delegate {
-								result = MessageService.ShowCustomDialog (new CredentialsDialog (url, types, cred)) == (int)Gtk.ResponseType.Ok;
+								using (var credDlg = new CredentialsDialog (url, types, cred))
+									result = MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok;
 							});
 						}
 
@@ -146,7 +147,8 @@ namespace MonoDevelop.VersionControl.Git
 			}
 
 			DispatchService.GuiSyncDispatch (delegate {
-				result = MessageService.ShowCustomDialog (new CredentialsDialog (url, types, cred)) == (int)Gtk.ResponseType.Ok;
+				using (var credDlg = new CredentialsDialog (url, types, cred))
+					result = MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok;
 			});
 
 			if (result) {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
index e25fb4b3d5..d06737c3c8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
@@ -801,6 +801,7 @@ namespace MonoDevelop.VersionControl.Git
 					}
 				} finally {
 					dlg.Destroy ();
+					dlg.Dispose ();
 				}
 			});
 			return res;
@@ -859,6 +860,7 @@ namespace MonoDevelop.VersionControl.Git
 						}
 					} finally {
 						dlg.Destroy ();
+						dlg.Dispose ();
 					}
 				});
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
index cd69eb6a68..1716305fd8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
@@ -76,13 +76,14 @@ namespace MonoDevelop.VersionControl.Git
 				});
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
 		public static void ShowConfigurationDialog (GitRepository repo)
 		{
-			var dlg = new GitConfigurationDialog (repo);
-			MessageService.ShowCustomDialog (dlg);
+			using (var dlg = new GitConfigurationDialog (repo))
+				MessageService.ShowCustomDialog (dlg);
 		}
 
 		public static void ShowMergeDialog (GitRepository repo, bool rebasing)
@@ -107,13 +108,14 @@ namespace MonoDevelop.VersionControl.Git
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
 		public static void ShowStashManager (GitRepository repo)
 		{
-			var dlg = new StashManagerDialog (repo);
-			MessageService.ShowCustomDialog (dlg);
+			using (var dlg = new StashManagerDialog (repo))
+				MessageService.ShowCustomDialog (dlg);
 		}
 
 		public async static void SwitchToBranch (GitRepository repo, string branch)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
index 28ca83bbf8..3ae7cff2a2 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
@@ -133,6 +133,7 @@ namespace MonoDevelop.VersionControl.Git
 					}
 				} finally {
 					dlg.Destroy ();
+					dlg.Dispose ();
 				}
 				Respond (ResponseType.Ok);
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
index e80c894d02..564694c9a4 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
@@ -43,6 +43,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 						}
 					} finally {
 						dlg.Destroy ();
+						dlg.Dispose ();
 						lock (monitor) {
 							System.Threading.Monitor.Pulse (monitor);
 						}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
index e4b241c289..9cbfacda40 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
@@ -43,6 +43,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 						}
 					} finally {
 						dlg.Destroy ();
+						dlg.Dispose ();
 						lock (monitor) {
 							System.Threading.Monitor.Pulse (monitor);
 						}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
index 9523bc59e2..fb2c68b89c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
@@ -60,16 +60,16 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 			object monitor = new Object ();
 			
 			EventHandler del = delegate {
+					SslServerTrustDialog dlg = new SslServerTrustDialog (realm, failures, certInfo, may_save);
 					try {
-						SslServerTrustDialog dlg = new SslServerTrustDialog (realm, failures, certInfo, may_save);
 						res = (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok);
 						if (res) {
 							local_save = dlg.Save;
 							local_accepted_failures = dlg.AcceptedFailures;
 						}
-					
-						dlg.Destroy ();
 					} finally {
+						dlg.Destroy ();
+						dlg.Dispose ();
 						lock (monitor) {
 							System.Threading.Monitor.Pulse (monitor);
 						}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
index 1d23bbebc8..21fe112d5f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
@@ -53,16 +53,17 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 			object monitor = new Object ();
 			
 			EventHandler del = delegate {
+					UserPasswordDialog dlg = new UserPasswordDialog (user, realm, may_save, showPwd);
 					try {
-						UserPasswordDialog dlg = new UserPasswordDialog (user, realm, may_save, showPwd);
 						res = (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok);
 						if (res) {
 							s = dlg.SavePassword ? 1 : 0;
 							pwd = dlg.Password;
 							user = dlg.User;
 						}
-						dlg.Destroy ();
 					} finally {
+						dlg.Destroy ();
+						dlg.Dispose ();
 						lock (monitor) {
 							System.Threading.Monitor.Pulse (monitor);
 						}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
index 1b0f467af7..576200514e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
@@ -166,6 +166,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -215,6 +216,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 					UpdateRepoDescription ();
 				} finally {
 					dlg.Destroy ();
+					dlg.Dispose ();
 				}
 			}
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
index 7e03982d5a..39bf804a96 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
@@ -24,6 +24,7 @@ namespace MonoDevelop.VersionControl
 				}
 			} finally {
 				del.Destroy ();
+				del.Dispose ();
 			}
 		}
 	}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
index 465ed3498a..b26ac01403 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
@@ -24,6 +24,7 @@ namespace MonoDevelop.VersionControl
 					dlg.EndCommit (false);
 				} finally {
 					dlg.Destroy ();
+					dlg.Dispose ();
 				}
 				VersionControlService.NotifyAfterCommit (vc, changeSet, false);
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
index 5dee5c58c9..9c34bc79cc 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
@@ -48,6 +48,7 @@ namespace MonoDevelop.VersionControl
 				} while (true);
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 			return true;
 		}

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/AlertDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/AlertDialog.cs
index c1158c1ee8..8bd896d2bc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/AlertDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/AlertDialog.cs
@@ -94,10 +94,12 @@ namespace MonoDevelop.Components.Extensions
 			}
 			
 			if (!data.Message.CancellationToken.IsCancellationRequested) {
-				MessageService.ShowCustomDialog (alertDialog, data.TransientFor);
-				if (alertDialog.ApplyToAll)
-					data.ApplyToAll = true;
-				data.ResultButton = alertDialog.ResultButton;
+				using (alertDialog) {
+					MessageService.ShowCustomDialog (alertDialog, data.TransientFor);
+					if (alertDialog.ApplyToAll)
+						data.ApplyToAll = true;
+					data.ResultButton = alertDialog.ResultButton;
+				}
 			}
 			alertDialog = null;
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs
index 56ccb60858..c93c8376a9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs
@@ -65,10 +65,11 @@ namespace MonoDevelop.Components.Extensions
 
 		protected override bool RunDefault ()
 		{
-			var errorDialog = new MonoDevelop.Ide.Gui.Dialogs.GtkErrorDialog (TransientFor, Title, Message, Buttons);
-			errorDialog.AddDetails (Exception.ToString (), false);
-			int result = MonoDevelop.Ide.MessageService.ShowCustomDialog (errorDialog);
-			ResultButton = result >= 0 ? Buttons [result] : null;
+			using (var errorDialog = new MonoDevelop.Ide.Gui.Dialogs.GtkErrorDialog (TransientFor, Title, Message, Buttons)) {
+				errorDialog.AddDetails (Exception.ToString (), false);
+				int result = MonoDevelop.Ide.MessageService.ShowCustomDialog (errorDialog);
+				ResultButton = result >= 0 ? Buttons [result] : null;
+			}
 			return true;
 		}
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs
index 85f8f60ada..9784169415 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs
@@ -324,6 +324,7 @@ namespace MonoDevelop.Components.Extensions
 				return result == (int) Gtk.ResponseType.Ok;
 			} finally {
 				fdiag.Destroy ();
+				fdiag.Dispose ();
 			}
 		}
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
index a0c8af95be..043010872f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
@@ -101,8 +101,10 @@ namespace MonoDevelop.Components.Extensions
 				
 				return false;
 			} finally {
-				if (md != null)
+				if (md != null) {
 					md.Destroy ();
+					md.Dispose ();
+				}
 			}
 		}
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
index 850e6a14f1..35a1754f2e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
@@ -269,20 +269,20 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 			#endregion

 			

 			//if 'OK' put items back in collection

-			if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, toplevel) == (int)ResponseType.Ok)

-			{
-				DesignerTransaction tran = CreateTransaction (Instance);
-				object old = collection;
+			using (dialog) {

+				if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, toplevel) == (int)ResponseType.Ok) {
+					DesignerTransaction tran = CreateTransaction (Instance);
+					object old = collection;
 			
-				try {
-					collection.Clear();

-					foreach (object[] o in itemStore)

-						collection.Add (o[0]);
-					EndTransaction (Instance, tran, old, collection, true);
-				}
-				catch {
-					EndTransaction (Instance, tran, old, collection, false);
-					throw;
+					try {
+						collection.Clear ();

+						foreach (object[] o in itemStore)

+							collection.Add (o [0]);
+						EndTransaction (Instance, tran, old, collection, true);
+					} catch {
+						EndTransaction (Instance, tran, old, collection, false);
+						throw;
+					}

 				}

 			}

 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
index 3488ab0044..925bf269e9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
@@ -85,12 +85,12 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 			dialog.DefaultWidth = 500;
 			dialog.DefaultHeight = 400;
 			dialog.ShowAll ();
-			return MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, parent);
+			return MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, parent);
 		}
 		
 		public void Dispose ()
 		{
-			dialog.Destroy ();
+			dialog.Dispose ();
 		}
 		
 		void OnToggled (object s, Gtk.ToggledArgs args)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs
index c171fc64a8..b7cb6a3f82 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs
@@ -67,12 +67,12 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 			dialog.DefaultWidth = 500;
 			dialog.DefaultHeight = 400;
 			dialog.ShowAll ();
-			return MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, dialog.TransientFor);
+			return MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, dialog.TransientFor);
 		}
 		
 		public void Dispose ()
 		{
-			dialog.Destroy ();
+			dialog.Dispose ();
 		}
 	}
 }
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 a454de6047..bad821ddfd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -114,9 +114,9 @@ namespace MonoDevelop.Ide.CodeTemplates
 			var template = GetSelectedTemplate ();
 			if (template != null) {
 				templatesToSave.Add (template);
-				var editDialog = new EditTemplateDialog (template, false);
-				if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok)
-					templatesToSave.Add (template);
+				using (var editDialog = new EditTemplateDialog (template, false))
+					if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok)
+						templatesToSave.Add (template);
 				HandleChanged (this, EventArgs.Empty);
 			}
 		}
@@ -132,11 +132,12 @@ namespace MonoDevelop.Ide.CodeTemplates
 		void ButtonAddClicked (object sender, EventArgs e)
 		{
 			var newTemplate = new CodeTemplate ();
-			var editDialog = new EditTemplateDialog (newTemplate, true);
-			if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok) {
-				InsertTemplate (newTemplate);
-				templates.Add (newTemplate);
-				templatesToSave.Add (newTemplate);
+			using (var editDialog = new EditTemplateDialog (newTemplate, true)) {
+				if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok) {
+					InsertTemplate (newTemplate);
+					templates.Add (newTemplate);
+					templatesToSave.Add (newTemplate);
+				}
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
index 0c654ba2e9..2de0908cc9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
@@ -108,8 +108,8 @@ namespace MonoDevelop.Ide.Commands
 	{
 		protected override void Run ()
 		{
-			var dlg = new NewFileDialog (null, null); // new file seems to fail if I pass the project IdeApp.ProjectOperations.CurrentSelectedProject
-			MessageService.ShowCustomDialog (dlg, IdeApp.Workbench.RootWindow);
+			using (var dlg = new NewFileDialog (null, null)) // new file seems to fail if I pass the project IdeApp.ProjectOperations.CurrentSelectedProject
+				MessageService.ShowCustomDialog (dlg, IdeApp.Workbench.RootWindow);
 		}
 	}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
index 768bce3ba5..5945ee6c96 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs
@@ -501,8 +501,8 @@ namespace MonoDevelop.Ide.Commands
 		
 		protected override void Run ()
 		{
-			ApplyPolicyDialog dlg = new ApplyPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution);
-			MessageService.ShowCustomDialog (dlg);
+			using (ApplyPolicyDialog dlg = new ApplyPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution))
+				MessageService.ShowCustomDialog (dlg);
 		}
 	}
 	
@@ -515,8 +515,8 @@ namespace MonoDevelop.Ide.Commands
 		
 		protected override void Run ()
 		{
-			ExportProjectPolicyDialog dlg = new ExportProjectPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution);
-			MessageService.ShowCustomDialog (dlg);
+			using (ExportProjectPolicyDialog dlg = new ExportProjectPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution))
+				MessageService.ShowCustomDialog (dlg);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
index 36d6161f18..d0d6c5a808 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
@@ -149,6 +149,7 @@ namespace MonoDevelop.Ide.Commands
 					newLayoutName = dlg.LayoutName; 
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 			if (newLayoutName != null) {
 				IdeApp.Workbench.CurrentLayout = newLayoutName;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeManagerDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeManagerDialog.cs
index 5f611e9ff8..81f89e9c76 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeManagerDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeManagerDialog.cs
@@ -94,6 +94,7 @@ namespace MonoDevelop.Ide.Execution
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -121,6 +122,7 @@ namespace MonoDevelop.Ide.Execution
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs
index 5debce92e6..63ec111bdc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs
@@ -123,8 +123,8 @@ namespace MonoDevelop.Ide.Execution
 		{
 			CommandItem item = (CommandItem) data;
 			if (item.Mode == null) {
-				var dlg = new CustomExecutionModeManagerDialog (item.Context);
-				MessageService.ShowCustomDialog (dlg);
+				using (var dlg = new CustomExecutionModeManagerDialog (item.Context))
+					MessageService.ShowCustomDialog (dlg);
 				return null;
 			}
 			
@@ -255,6 +255,7 @@ namespace MonoDevelop.Ide.Execution
 					}
 				} finally {
 					dlg.Destroy ();
+					dlg.Dispose ();
 				}
 			});
 			return cmode;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs
index dbb2c446cf..4407acbb1b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs
@@ -61,8 +61,8 @@ namespace MonoDevelop.Ide.Execution
 		protected virtual void OnButtonPreviewClicked (object sender, System.EventArgs e)
 		{
 			propertyGrid.CommitPendingChanges ();
-			var dlg = new MonoExecutionParametersPreview (config);
-			MessageService.ShowCustomDialog (dlg, this.Toplevel as Gtk.Window);
+			using (var dlg = new MonoExecutionParametersPreview (config))
+				MessageService.ShowCustomDialog (dlg, this.Toplevel as Gtk.Window);
 		}
 
 		protected virtual void OnButtonResetClicked (object sender, System.EventArgs e)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs
index 9d32844019..d8473dcb86 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs
@@ -99,6 +99,7 @@ namespace MonoDevelop.Ide.Fonts
 						setFontButton.Label = selectionDialog.FontName;
 					} finally {
 						selectionDialog.Destroy ();
+						selectionDialog.Dispose ();
 					}
 				};
 				hBox.PackStart (setFontButton, true, true, 0);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectFileEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectFileEntry.cs
index 04a34bcaf2..0f6d332d39 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectFileEntry.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ProjectFileEntry.cs
@@ -113,6 +113,7 @@ namespace MonoDevelop.Ide.Gui.Components
 				}
 			} finally {
 				dialog.Destroy ();
+				dialog.Dispose ();
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs
index a42caae6b0..b7a4e7aa90 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs
@@ -124,14 +124,16 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 					MessageService.PlaceDialog (instance, IdeApp.Workbench.RootWindow);
 					instance.Response += delegate {
 						instance.Destroy ();
+						instance.Dispose ();
 						instance = null;
 					};
 				}
 				instance.Present ();
 				return;
 			}
-			
-			MessageService.ShowCustomDialog (new CommonAboutDialog ());
+
+			using (var dlg = new CommonAboutDialog ())
+				MessageService.ShowCustomDialog (dlg);
 		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs
index 57734be375..0c42fa9d38 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs
@@ -196,8 +196,8 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 		void EncodingChanged (object s, EventArgs args)
 		{
 			if (encodingMenu.History == selectOption) {
-				var dlg = new SelectEncodingsDialog ();
-				MessageService.ShowCustomDialog (dlg, this);
+				using (var dlg = new SelectEncodingsDialog ())
+					MessageService.ShowCustomDialog (dlg, this);
 				FillEncodings ();
 			}
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs
index 4d11aff9f5..edda654d3d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs
@@ -83,7 +83,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 				scrolled.VscrollbarPolicy = PolicyType.Never;
 				this.Resize (10, 10);
 			}
-			return MessageService.RunCustomDialog (this, null);
+			return MessageService.ShowCustomDialog (this, null);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs
index 1d517f3df8..430502ff21 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs
@@ -112,6 +112,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 					return false;
 			} finally {
 				win.Destroy ();
+				win.Dispose ();
 			}
 		}
 	}

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
index f68d58eac7..4f07d317a8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
@@ -445,17 +445,18 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 				return;
 			}
 
-			var impdlg = new IncludeNewFilesDialog (GettextCatalog.GetString ("Select files to add from {0}", srcRoot.FileName), srcRoot);
-			impdlg.AddFiles (foundFiles);
-			if (MessageService.ShowCustomDialog (impdlg) != (int) ResponseType.Ok)
-				return;
-				
-			var srcFiles = impdlg.SelectedFiles;
-			var targetFiles = srcFiles.Select (f => targetRoot.Combine (f.ToRelative (srcRoot)));
+			using (var impdlg = new IncludeNewFilesDialog (GettextCatalog.GetString ("Select files to add from {0}", srcRoot.FileName), srcRoot)) {
+				impdlg.AddFiles (foundFiles);
+				if (MessageService.ShowCustomDialog (impdlg) != (int) ResponseType.Ok)
+					return;
+					
+				var srcFiles = impdlg.SelectedFiles;
+				var targetFiles = srcFiles.Select (f => targetRoot.Combine (f.ToRelative (srcRoot)));
 
-			var added = IdeApp.ProjectOperations.AddFilesToProject (project, srcFiles.ToArray (), targetFiles.ToArray (), null).Any ();
-			if (added)
-				await IdeApp.ProjectOperations.SaveAsync (project);
+				var added = IdeApp.ProjectOperations.AddFilesToProject (project, srcFiles.ToArray (), targetFiles.ToArray (), null).Any ();
+				if (added)
+					await IdeApp.ProjectOperations.SaveAsync (project);
+			}
 		}
 
 		///<summary>Adds an existing folder to the current folder</summary>
@@ -502,17 +503,18 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 
 			var foundFiles = Directory.GetFiles (srcRoot, "*", SearchOption.AllDirectories);
 			
-			var impdlg = new IncludeNewFilesDialog (GettextCatalog.GetString ("Select files to add from {0}", srcRoot.FileName), srcRoot.ParentDirectory);
-			impdlg.AddFiles (foundFiles);
-			if (MessageService.ShowCustomDialog (impdlg) == (int) ResponseType.Ok) {
-				var srcFiles = impdlg.SelectedFiles;
-				var targetFiles = srcFiles.Select (f => targetRoot.Combine (f.ToRelative (srcRoot)));
-				if (IdeApp.ProjectOperations.AddFilesToProject (project, srcFiles.ToArray (), targetFiles.ToArray (), null).Any ())
-					changedProject = true;
-			}
+			using (var impdlg = new IncludeNewFilesDialog (GettextCatalog.GetString ("Select files to add from {0}", srcRoot.FileName), srcRoot.ParentDirectory)) {
+				impdlg.AddFiles (foundFiles);
+				if (MessageService.ShowCustomDialog (impdlg) == (int)ResponseType.Ok) {
+					var srcFiles = impdlg.SelectedFiles;
+					var targetFiles = srcFiles.Select (f => targetRoot.Combine (f.ToRelative (srcRoot)));
+					if (IdeApp.ProjectOperations.AddFilesToProject (project, srcFiles.ToArray (), targetFiles.ToArray (), null).Any ())
+						changedProject = true;
+				}
 			
-			if (changedProject)
-				await IdeApp.ProjectOperations.SaveAsync (project);
+				if (changedProject)
+					await IdeApp.ProjectOperations.SaveAsync (project);
+			}
 		}
 		
 		[CommandHandler (ProjectCommands.NewFolder)]
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index de08bea4b2..f349aaa671 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -711,10 +711,11 @@ namespace MonoDevelop.Ide.Gui
 			}
 
 			if (showDirtyDialog) {
-				DirtyFilesDialog dlg = new DirtyFilesDialog ();
-				dlg.Modal = true;
-				if (MessageService.ShowCustomDialog (dlg, this) != (int)Gtk.ResponseType.Ok)
-					return false;
+				using (DirtyFilesDialog dlg = new DirtyFilesDialog ()) {
+					dlg.Modal = true;
+					if (MessageService.ShowCustomDialog (dlg, this) != (int)Gtk.ResponseType.Ok)
+						return false;
+				}
 			}
 			
 			if (!IdeApp.Workspace.Close (false, false))
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
index b7170889ce..6a241459a8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
@@ -638,6 +638,7 @@ namespace MonoDevelop.Ide.Gui
 				}
 			} finally {
 				ops.Destroy ();
+				ops.Dispose ();
 			}
 		}
 		
@@ -660,6 +661,7 @@ namespace MonoDevelop.Ide.Gui
 				MessageService.RunCustomDialog (ops, parentWindow);
 			} finally {
 				ops.Destroy ();
+				ops.Dispose ();
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
index 1b800f55fd..2adbab10a8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
@@ -49,14 +49,15 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 				MessageService.ShowWarning (monitor.Warnings[0]);
 			}
 			else if (monitor.HasErrors || monitor.HasWarnings) {
-				var resultDialog = new MultiMessageDialog () {
+				using (var resultDialog = new MultiMessageDialog () {
 					Modal = true,
-				};
-				foreach (var m in monitor.Errors)
-					resultDialog.AddError (m.Message);
-				foreach (var m in monitor.Warnings)
-					resultDialog.AddWarning (m);
-				MessageService.ShowCustomDialog (resultDialog);
+				}) {
+					foreach (var m in monitor.Errors)
+						resultDialog.AddError (m.Message);
+					foreach (var m in monitor.Warnings)
+						resultDialog.AddWarning (m);
+					MessageService.ShowCustomDialog (resultDialog);
+				}
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
index e81655f224..97059258ac 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
@@ -395,6 +395,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/SolutionItemConfigurationsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/SolutionItemConfigurationsPanel.cs
index f845e31613..6ae8eb9397 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/SolutionItemConfigurationsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/SolutionItemConfigurationsPanel.cs
@@ -119,6 +119,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 				} while (!done);
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -144,6 +145,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 		
@@ -170,6 +172,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 				} while (!done);
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs
index 7eb44e4bdf..6377843060 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs
@@ -98,6 +98,7 @@ namespace MonoDevelop.Ide.Projects
 				return result == (int) Gtk.ResponseType.Ok;
 			} finally {
 				fdiag.Destroy ();
+				fdiag.Dispose ();
 			}
 		}
 	}

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
index e2ecbf51a2..57e9e71fe2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
@@ -189,6 +189,7 @@ namespace MonoDevelop.Ide.Projects
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -206,6 +207,7 @@ namespace MonoDevelop.Ide.Projects
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
@@ -262,6 +264,7 @@ namespace MonoDevelop.Ide.Projects
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
index 4b3214b640..7c9bda6a96 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
@@ -216,9 +216,10 @@ namespace MonoDevelop.Ide
 				ImageService.Initialize ();
 				
 				if (errorsList.Count > 0) {
-					AddinLoadErrorDialog dlg = new AddinLoadErrorDialog ((AddinError[]) errorsList.ToArray (typeof(AddinError)), false);
-					if (!dlg.Run ())
-						return 1;
+					using (AddinLoadErrorDialog dlg = new AddinLoadErrorDialog ((AddinError[]) errorsList.ToArray (typeof(AddinError)), false)) {
+						if (!dlg.Run ())
+							return 1;
+					}
 					reportedFailures = errorsList.Count;
 				}
 
@@ -256,8 +257,8 @@ namespace MonoDevelop.Ide
 			}
 
 			if (errorsList.Count > reportedFailures) {
-				AddinLoadErrorDialog dlg = new AddinLoadErrorDialog ((AddinError[]) errorsList.ToArray (typeof(AddinError)), true);
-				dlg.Run ();
+				using (AddinLoadErrorDialog dlg = new AddinLoadErrorDialog ((AddinError[]) errorsList.ToArray (typeof(AddinError)), true))
+					dlg.Run ();
 			}
 			
 			errorsList = null;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
index e20fc55c25..b282d39852 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -366,6 +366,7 @@ namespace MonoDevelop.Ide
 				}
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 		
@@ -583,6 +584,7 @@ namespace MonoDevelop.Ide
 				return false;
 			} finally {
 				dlg.Destroy ();
+				dlg.Dispose ();
 			}
 		}
 		
@@ -628,6 +630,7 @@ namespace MonoDevelop.Ide
 					}
 				} finally {
 					optionsDialog.Destroy ();
+					optionsDialog.Dispose ();
 				}
 			} else if (entry is Solution) {
 				Solution solution = (Solution) entry;
@@ -643,6 +646,7 @@ namespace MonoDevelop.Ide
 					}
 				} finally {
 					optionsDialog.Destroy ();
+					optionsDialog.Dispose ();
 				}
 			}
 			else {
@@ -662,6 +666,7 @@ namespace MonoDevelop.Ide
 					}
 				} finally {
 					optionsDialog.Destroy ();
+					optionsDialog.Dispose ();
 				}
 			}
 		}
@@ -822,10 +827,11 @@ namespace MonoDevelop.Ide
 		
 		public bool CreateProjectFile (Project parentProject, string basePath, string selectedTemplateId)
 		{
-			NewFileDialog nfd = new NewFileDialog (parentProject, basePath);
-			if (selectedTemplateId != null)
-				nfd.SelectTemplate (selectedTemplateId);
-			return MessageService.ShowCustomDialog (nfd) == (int) Gtk.ResponseType.Ok;
+			using (NewFileDialog nfd = new NewFileDialog (parentProject, basePath)) {
+				if (selectedTemplateId != null)
+					nfd.SelectTemplate (selectedTemplateId);
+				return MessageService.ShowCustomDialog (nfd) == (int)Gtk.ResponseType.Ok;
+			}
 		}
 
 		public bool AddReferenceToProject (DotNetProject project)
@@ -910,6 +916,7 @@ namespace MonoDevelop.Ide
 					}
 				} finally {
 					dlg.Destroy ();
+					dlg.Dispose ();
 				}
 			}
 			else if (result == AlertButton.Remove && IdeApp.Workspace.RequestItemUnload (prj)) {
@@ -1728,8 +1735,10 @@ namespace MonoDevelop.Ide
 							newFileList.Add (null);
 						}
 					} finally {
-						if (addExternalDialog != null)
+						if (addExternalDialog != null) {
 							addExternalDialog.Destroy ();
+							addExternalDialog.Dispose ();
+						}
 					}
 				}
 			}