diff --git a/MissionEditor/TriggerOptionsDlg.cpp b/MissionEditor/TriggerOptionsDlg.cpp
index 0eac96e..11c8cc5 100644
--- a/MissionEditor/TriggerOptionsDlg.cpp
+++ b/MissionEditor/TriggerOptionsDlg.cpp
@@ -65,6 +65,7 @@ void CTriggerOptionsDlg::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(CTriggerOptionsDlg, CDialog)
 	//{{AFX_MSG_MAP(CTriggerOptionsDlg)
+	ON_WM_SHOWWINDOW()
 	ON_CBN_EDITCHANGE(IDC_HOUSE, OnEditchangeHouse)
 	ON_CBN_EDITCHANGE(IDC_ATTACHEDTRIGGER, OnEditchangeAttachedtrigger)
 	ON_EN_KILLFOCUS(IDC_NAME, OnChangeName)
@@ -237,10 +238,26 @@ void CTriggerOptionsDlg::OnKillfocusName()
 void CTriggerOptionsDlg::OnKillFocus(CWnd* pNewWnd)
 {
 	CDialog::OnKillFocus(pNewWnd);
-
 	((CTriggerEditorDlg*)(this->GetOwner()->GetOwner()))->UpdateDialog();
 }
 
+void CTriggerOptionsDlg::OnShowWindow(BOOL bShow, UINT nStatus)
+{
+	if (!bShow) {
+		if (auto pOldFocus = GetFocus()) {
+			switch (pOldFocus->GetDlgCtrlID())
+			{
+			case IDC_NAME: {
+				this->OnChangeName();
+			} break;
+			default:
+				break;
+			}
+		}
+	}
+	CDialog::OnShowWindow(bShow, nStatus);
+}
+
 void CTriggerOptionsDlg::OnEditchangeTriggertype()
 {
 	CIniFile& ini = Map->GetIniFile();
diff --git a/MissionEditor/TriggerOptionsDlg.h b/MissionEditor/TriggerOptionsDlg.h
index 3a96609..360be8a 100644
--- a/MissionEditor/TriggerOptionsDlg.h
+++ b/MissionEditor/TriggerOptionsDlg.h
@@ -66,6 +66,8 @@ protected:
 	CToolTipCtrl m_tooltip;
 	virtual BOOL OnInitDialog();
 
+	void OnShowWindow(BOOL bShow, UINT nStatus);
+
 	// Generierte Nachrichtenzuordnungsfunktionen
 	//{{AFX_MSG(CTriggerOptionsDlg)
 	afx_msg void OnChangeName();