diff --git a/ToolCollection/frmNIVerknuepfungen.Designer.vb b/ToolCollection/frmNIVerknuepfungen.Designer.vb
index c38433d..7431d3e 100644
--- a/ToolCollection/frmNIVerknuepfungen.Designer.vb
+++ b/ToolCollection/frmNIVerknuepfungen.Designer.vb
@@ -1743,6 +1743,7 @@ Partial Class frmNIVerknuepfungen
         '
         'btnUnlink
         '
+        Me.btnUnlink.Enabled = False
         Me.btnUnlink.Image = Global.ToolCollection.My.Resources.Resources.link_break
         Me.btnUnlink.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.btnUnlink.Location = New System.Drawing.Point(409, 202)
diff --git a/ToolCollection/frmNIVerknuepfungen.vb b/ToolCollection/frmNIVerknuepfungen.vb
index 589b1a1..6844fc9 100644
--- a/ToolCollection/frmNIVerknuepfungen.vb
+++ b/ToolCollection/frmNIVerknuepfungen.vb
@@ -1709,6 +1709,9 @@ Public Class frmNIVerknuepfungen
                     If Me.lvwVerknuepfungen.SelectedItems.Count > 0 Then
                         If Me.lvwVerknuepfungen.SelectedItems(0).SubItems(1).Text.StartsWith("%") And Me.lvwVerknuepfungen.SelectedItems(0).SubItems(1).Text.EndsWith("%") Then
                             Me.grbFilterDB.Enabled = False
+
+                            btnUnlink.Enabled = (lvwVerknuepfungen.SelectedItems.Count > 0)
+
                             Exit Sub
                         End If
                     End If
@@ -2027,7 +2030,7 @@ Public Class frmNIVerknuepfungen
             End If
 
         End If
-
+        btnUnlink.Enabled = (lvwVerknuepfungen.SelectedItems.Count > 0)
 
     End Sub