diff --git a/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb b/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb
index 6b9346e..55e5c73 100644
--- a/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb
+++ b/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb
@@ -282,7 +282,7 @@ Public Class EgtManageFileDialogVM
       End Get
       Set(value As String)
          m_sInitialDirectory = value
-         m_sSaveFileName = "New.icrs"
+         If m_sFileName = String.Empty Then m_sSaveFileName = "New.icrs"
          m_sSelPath = m_sInitialDirectory
 
          Dim DirectoryStart As String() = m_sInitialDirectory.Split("\"c)
@@ -337,7 +337,7 @@ Public Class EgtManageFileDialogVM
       End Get
       Set(value As String)
          m_sFileName = value
-         m_sSaveFileName = m_sFileName
+         m_sSaveFileName = Path.GetFileName(m_sFileName)
       End Set
    End Property
 
@@ -503,9 +503,11 @@ Public Class EgtManageFileDialogVM
                End If
             Next
          ElseIf m_bValidateNames = False And m_bOverwritePrompt Then
-            If m_sFileName.Equals(m_sSaveFileName) OrElse m_sSaveFileName.Equals(CurrItem.sName) Then
-               If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15073), sTitle, MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
-                  Return
+            If Not IsNothing(CurrItem) Then
+               If m_sFileName.Equals(m_sSaveFileName) OrElse m_sSaveFileName.Equals(CurrItem.sName) Then
+                  If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15073), sTitle, MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
+                     Return
+                  End If
                End If
             Else
                m_sFileName = m_SelTreeItem.sFullName & "\" & m_sSaveFileName
diff --git a/Icarus/EgtMessageBox/EgtMessageBoxV.xaml.vb b/Icarus/EgtMessageBox/EgtMessageBoxV.xaml.vb
index dea49a8..8a6cca3 100644
--- a/Icarus/EgtMessageBox/EgtMessageBoxV.xaml.vb
+++ b/Icarus/EgtMessageBox/EgtMessageBoxV.xaml.vb
@@ -99,7 +99,7 @@ Public Class EgtMessageBoxV
 
 #Region "EVENTS"
 
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
+   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.OnCloseWindow
       Me.DialogResult = DialogResult
       Me.Close()
    End Sub