Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf -r80d33e42292f20775a8230ba6d14e357a002e4ae
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 80d33e42292f20775a8230ba6d14e357a002e4ae)
@@ -92,7 +92,6 @@
     <Compile Include="Dialogs\ExceptionDialog.Designer.cs">
       <DependentUpon>ExceptionDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="Dialogs\ModalHelper.cs" />
     <Compile Include="DragOperations.cs" />
     <Compile Include="IReusableView.cs" />
     <Compile Include="IView.cs" />
Fisheye: Tag 80d33e42292f20775a8230ba6d14e357a002e4ae refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Dialogs/ModalHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs
===================================================================
diff -u -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf -r80d33e42292f20775a8230ba6d14e357a002e4ae
--- Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
+++ Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 80d33e42292f20775a8230ba6d14e357a002e4ae)
@@ -89,14 +89,5 @@
                 return ResourceManager.GetString("ExceptionDialog_GetExceptionText_Loader_exceptions", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hoofdvenster niet geïnjecteerd..
-        /// </summary>
-        internal static string ModalHelper_ShowModal_Main_window_not_injected {
-            get {
-                return ResourceManager.GetString("ModalHelper_ShowModal_Main_window_not_injected", resourceCulture);
-            }
-        }
     }
 }
Index: Core/Common/src/Core.Common.Controls/Properties/Resources.resx
===================================================================
diff -u -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf -r80d33e42292f20775a8230ba6d14e357a002e4ae
--- Core/Common/src/Core.Common.Controls/Properties/Resources.resx	(.../Resources.resx)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
+++ Core/Common/src/Core.Common.Controls/Properties/Resources.resx	(.../Resources.resx)	(revision 80d33e42292f20775a8230ba6d14e357a002e4ae)
@@ -129,7 +129,4 @@
     <value>Foutmelding van de loader:
 </value>
   </data>
-  <data name="ModalHelper_ShowModal_Main_window_not_injected" xml:space="preserve">
-    <value>Hoofdvenster niet geïnjecteerd.</value>
-  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4 -r80d33e42292f20775a8230ba6d14e357a002e4ae
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 80d33e42292f20775a8230ba6d14e357a002e4ae)
@@ -16,7 +16,6 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
-using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Forms.MessageWindow;
 using Core.Common.Gui.Forms.Options;
 using Core.Common.Gui.Properties;
@@ -76,7 +75,6 @@
             InitializeComponent();
 
             windowInteropHelper = new WindowInteropHelper(this);
-            ModalHelper.MainWindow = this;
 
             log.Info(Properties.Resources.MainWindow_MainWindow_Main_window_created_);
         }
@@ -611,7 +609,7 @@
         {
             if (messageWindow == null || messageWindow.IsDisposed)
             {
-                messageWindow = new MessageWindow.MessageWindow
+                messageWindow = new MessageWindow.MessageWindow(this)
                 {
                     Text = Properties.Resources.Messages
                 };
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf -r80d33e42292f20775a8230ba6d14e357a002e4ae
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 80d33e42292f20775a8230ba6d14e357a002e4ae)
@@ -5,7 +5,6 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Properties;
 using log4net.Core;
 
@@ -14,12 +13,15 @@
     public partial class MessageWindow : UserControl, IMessageWindow
     {
         public event EventHandler OnError;
+        private readonly IWin32Window owner;
         private readonly Dictionary<string, string> levelImageName;
         private readonly ConcurrentQueue<MessageData> newMessages = new ConcurrentQueue<MessageData>();
         private bool filtering;
 
-        public MessageWindow()
+        public MessageWindow(IWin32Window owner)
         {
+            this.owner = owner;
+
             Text = Resources.MessageWindow_MessageWindow_Messages;
             MessageWindowLogAppender.MessageWindow = this;
             InitializeComponent();
@@ -263,7 +265,7 @@
 
             form.Controls.Add(textDocumentView);
             form.Select();
-            ModalHelper.ShowModal(form);
+            form.ShowDialog(owner);
         }
 
         private class MessageData
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs
===================================================================
diff -u -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf -r80d33e42292f20775a8230ba6d14e357a002e4ae
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs	(.../MapChangeCoordinateSystemCommand.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs	(.../MapChangeCoordinateSystemCommand.cs)	(revision 80d33e42292f20775a8230ba6d14e357a002e4ae)
@@ -1,5 +1,4 @@
 using System.Windows.Forms;
-using Core.Common.Controls.Dialogs;
 using Core.GIS.SharpMap.CoordinateSystems.Transformations;
 using Core.GIS.SharpMap.Extensions.CoordinateSystems;
 using Core.GIS.SharpMap.UI.Forms;
@@ -24,7 +23,7 @@
 
             var selectCoordinateSystemDialog = new SelectCoordinateSystemDialog(OgrCoordinateSystemFactory.SupportedCoordinateSystems, GIS.SharpMap.Map.Map.CoordinateSystemFactory.CustomCoordinateSystems);
 
-            if (ModalHelper.ShowModal(selectCoordinateSystemDialog) == DialogResult.OK)
+            if (selectCoordinateSystemDialog.ShowDialog(Gui.MainWindow) == DialogResult.OK)
             {
                 try
                 {