diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index c753160a..e918bccd 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -47,7 +47,6 @@ Partial Public Class frmEnvelopeEditor
 
     Private Sub frmEditor_Load(sender As Object, e As EventArgs) Handles Me.Load
         Logger = State.LogConfig.GetLogger()
-        Me.Text = State.DbConfig.ExternalProgramName + " - Umschlag-Editor"
 
         If Envelope Is Nothing Then
             Controller = New EnvelopeEditorController(State)
@@ -84,6 +83,8 @@ Partial Public Class frmEnvelopeEditor
 
         GridDocuments.DataSource = Documents
         GridReceivers.DataSource = Receivers
+
+        SetFormTitle(Controller.Envelope.Title)
     End Sub
 
     Private Sub SetFormReadonly()
@@ -328,17 +329,19 @@ Partial Public Class frmEnvelopeEditor
 
     Private Sub btnEditData_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditData.ItemClick
         Dim oForm As New frmEnvelopeMainData() With
-            {
-                .State = State,
-                .EnvelopeTitle = Controller.Envelope.Title,
-                .EnvelopeContractType = Controller.Envelope.ContractType,
-                .NewEnvelopeMode = False
-            }
+        {
+            .State = State,
+            .EnvelopeTitle = Controller.Envelope.Title,
+            .EnvelopeContractType = Controller.Envelope.ContractType,
+            .NewEnvelopeMode = False
+        }
+
         If oForm.ShowDialog() = DialogResult.OK Then
             Controller.Envelope.Title = oForm.EnvelopeTitle
             Controller.Envelope.ContractType = oForm.EnvelopeContractType
-
         End If
+
+        SetFormTitle(Controller.Envelope.Title)
     End Sub
 
     Private Sub GridReceivers_PaintEx(sender As Object, e As DevExpress.XtraGrid.PaintExEventArgs) Handles GridReceivers.PaintEx
@@ -380,4 +383,12 @@ Partial Public Class frmEnvelopeEditor
         End If
     End Sub
 
+    Private Sub SetFormTitle(pTitle As String)
+        Dim oFormTitle As String = State.DbConfig.ExternalProgramName + " - Umschlag-Editor"
+        If String.IsNullOrEmpty(pTitle) = False Then
+            oFormTitle += " - " + Controller.Envelope.Title.Substring(0, 30)
+        End If
+
+        Me.Text = oFormTitle
+    End Sub
 End Class