Index: Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj
===================================================================
diff -u -rf69f7ede062499ad74081a7b8afe32085c6d17c0 -r0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a
--- Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision f69f7ede062499ad74081a7b8afe32085c6d17c0)
+++ Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision 0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a)
@@ -234,7 +234,9 @@
     <Compile Include="TreeViewControls\TreeViewNodePresenterBase.cs" />
     <Compile Include="TreeViewControls\TreeViewController.cs" />
     <Compile Include="WindowsFormsHelper.cs" />
-    <Compile Include="WizardDialog.cs" />
+    <Compile Include="WizardDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="WizardDialog.Designer.cs">
       <DependentUpon>WizardDialog.cs</DependentUpon>
     </Compile>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -r5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08 -r0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a)
@@ -34,6 +34,7 @@
         private bool canSelectItem = true;
         private bool settingSelection = false;
         private readonly StackTrace constructorStackTrace;
+        private ExportMapToImageMapTool exportMapToImageMapTool;
 
         public MapView()
         {
@@ -54,7 +55,8 @@
             IsTabControlVisible = false;
 
             // add some tools here, to avoid references to Ringtoets projects in SharpMap
-            MapControl.Tools.Add(new ExportMapToImageMapTool());
+            exportMapToImageMapTool = new ExportMapToImageMapTool();
+            MapControl.Tools.Add(exportMapToImageMapTool);
             Map = new Map(MapControl.ClientSize)
             {
                 Zoom = 100
@@ -66,6 +68,18 @@
             }
         }
 
+        public IWin32Window Owner
+        {
+            get
+            {
+                return exportMapToImageMapTool.Owner;
+            }
+            set
+            {
+                exportMapToImageMapTool.Owner = value;
+            }
+        }
+
         public bool IsTabControlVisible
         {
             get
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -r0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision 0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a)
@@ -169,7 +169,8 @@
         {
             yield return new ViewInfo<Map, MapView>
             {
-                Description = "Map"
+                Description = "Map",
+                AfterCreate = (view, map) => view.Owner = gui.MainWindow
             };
             yield return new ViewInfo<DataTable, TableView>
             {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportImageHelper.cs
===================================================================
diff -u -r3e5b477ac8dc4113688581e5e08c71fdd6d66ae8 -r0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportImageHelper.cs	(.../ExportImageHelper.cs)	(revision 3e5b477ac8dc4113688581e5e08c71fdd6d66ae8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportImageHelper.cs	(.../ExportImageHelper.cs)	(revision 0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a)
@@ -46,7 +46,7 @@
             imageToWrite.Save(filePath, ImageFormats[imageType.ToLower()]);
         }
 
-        public static void ExportWithDialog(Image image)
+        public static void ExportWithDialog(IWin32Window owner, Image image)
         {
             if (image == null)
             {
@@ -63,7 +63,7 @@
                 Title = Resources.Export_as_Image
             };
 
-            if (saveFileDialog.ShowDialog() != DialogResult.OK)
+            if (saveFileDialog.ShowDialog(owner) != DialogResult.OK)
             {
                 return;
             }
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportMapToImageMapTool.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportMapToImageMapTool.cs	(.../ExportMapToImageMapTool.cs)	(revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportMapToImageMapTool.cs	(.../ExportMapToImageMapTool.cs)	(revision 0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Core.Common.Controls.Swf;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.SharpMap.UI.Tools;
 using Core.Plugins.SharpMapGis.Properties;
@@ -18,6 +17,8 @@
             }
         }
 
+        public IWin32Window Owner { get; set; }
+
         public override IEnumerable<MapToolContextMenuItem> GetContextMenuItems(ICoordinate worldPosition)
         {
             var name = Resources.ExportMapToImageMapTool_OnBeforeContextMenu_Export_map_as_image;
@@ -41,7 +42,7 @@
 
         public override void Execute()
         {
-            ExportImageHelper.ExportWithDialog(MapControl.Image);
+            ExportImageHelper.ExportWithDialog(Owner, MapControl.Image);
         }
 
         private void ExportMapEventHandler(object sender, EventArgs e)