diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
index 924e33dc..4e4f18a8 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
@@ -54,8 +54,8 @@ Partial Public Class frmEnvelopeEditor
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupAddSignature = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupReceiver = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.LayoutControlGroup4 = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlGroup5 = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
@@ -280,7 +280,7 @@ Partial Public Class frmEnvelopeEditor
         '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup5})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
@@ -306,17 +306,17 @@ Partial Public Class frmEnvelopeEditor
         Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
         resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
         '
-        'RibbonPageGroup4
+        'RibbonPageGroupAddSignature
         '
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.btnEditFields)
-        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
-        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
+        Me.RibbonPageGroupAddSignature.ItemLinks.Add(Me.btnEditFields)
+        Me.RibbonPageGroupAddSignature.Name = "RibbonPageGroupAddSignature"
+        resources.ApplyResources(Me.RibbonPageGroupAddSignature, "RibbonPageGroupAddSignature")
         '
-        'RibbonPageGroup5
+        'RibbonPageGroupReceiver
         '
-        Me.RibbonPageGroup5.ItemLinks.Add(Me.btnDeleteReceiver)
-        Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
-        resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5")
+        Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.btnDeleteReceiver)
+        Me.RibbonPageGroupReceiver.Name = "RibbonPageGroupReceiver"
+        resources.ApplyResources(Me.RibbonPageGroupReceiver, "RibbonPageGroupReceiver")
         '
         'LayoutControlGroup4
         '
@@ -665,7 +665,7 @@ Partial Public Class frmEnvelopeEditor
     Friend WithEvents btnSendEnvelope As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents btnEditFields As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupAddSignature As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents PanelControl1 As PanelControl
     Friend WithEvents PanelControl2 As PanelControl
     Friend WithEvents EnvelopeReceiverBindingSource As BindingSource
@@ -675,7 +675,7 @@ Partial Public Class frmEnvelopeEditor
     Friend WithEvents EnvelopeDocumentBindingSource As BindingSource
     Friend WithEvents FrmEditorBindingSource As BindingSource
     Friend WithEvents btnDeleteReceiver As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupReceiver As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents btnEditData As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents colThumbnail As DevExpress.XtraGrid.Columns.TileViewColumn
     Friend WithEvents LayoutControlGroup1 As LayoutControlGroup
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
index 110c88a0..04c3200b 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
@@ -353,10 +353,10 @@
   <data name="RibbonPageGroup3.Text" xml:space="preserve">
     <value>Prozess</value>
   </data>
-  <data name="RibbonPageGroup4.Text" xml:space="preserve">
+  <data name="RibbonPageGroupAddSignature.Text" xml:space="preserve">
     <value>Signaturen</value>
   </data>
-  <data name="RibbonPageGroup5.Text" xml:space="preserve">
+  <data name="RibbonPageGroupReceiver.Text" xml:space="preserve">
     <value>Empfänger</value>
   </data>
   <data name="RibbonPage1.Text" xml:space="preserve">
@@ -924,16 +924,16 @@
   <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup4.Name" xml:space="preserve">
-    <value>RibbonPageGroup4</value>
+  <data name="&gt;&gt;RibbonPageGroupAddSignature.Name" xml:space="preserve">
+    <value>RibbonPageGroupAddSignature</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageGroupAddSignature.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup5.Name" xml:space="preserve">
-    <value>RibbonPageGroup5</value>
+  <data name="&gt;&gt;RibbonPageGroupReceiver.Name" xml:space="preserve">
+    <value>RibbonPageGroupReceiver</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup5.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageGroupReceiver.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;LayoutControlGroup4.Name" xml:space="preserve">
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index e46cd77d..ec008208 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -42,6 +42,7 @@ Partial Public Class frmEnvelopeEditor
                 MsgBox(Resources.Envelope.Document_Could_Not_Be_Saved, MsgBoxStyle.Critical, Text)
             End If
         End If
+        RibbonPageGroupAddSignature_Enabled()
     End Sub
 
     Private Sub frmEditor_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -89,7 +90,7 @@ Partial Public Class frmEnvelopeEditor
         RibbonPageGroup1.Enabled = False
         RibbonPageGroup2.Enabled = False
         RibbonPageGroup3.Enabled = False
-        RibbonPageGroup5.Enabled = False
+        RibbonPageGroupReceiver.Enabled = False
         btnEditFields.Enabled = False
         txtSubject.Properties.ReadOnly = True
         txtMessage.Properties.ReadOnly = True
@@ -353,4 +354,23 @@ Partial Public Class frmEnvelopeEditor
         oReceiver.ColorType = oColorType
     End Sub
 
+    Private Sub frmEnvelopeEditor_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        RibbonPageGroupAddSignature_Enabled()
+        RibbonPageGroupReceiver_Enable()
+    End Sub
+    Private Sub RibbonPageGroupAddSignature_Enabled()
+        If ViewDocuments.GetSelectedRows().Count = 0 Then
+            RibbonPageGroupAddSignature.Enabled = False
+        Else
+            RibbonPageGroupAddSignature.Enabled = True
+        End If
+    End Sub
+    Private Sub RibbonPageGroupReceiver_Enable()
+        If ViewReceivers.SelectedRowsCount = 0 Then
+            RibbonPageGroupReceiver.Enabled = False
+        Else
+            RibbonPageGroupReceiver.Enabled = True
+        End If
+    End Sub
+
 End Class