diff --git a/src/gui/EditWidgetProperties.cpp b/src/gui/EditWidgetProperties.cpp
index 462d4953b..d2eee4338 100644
--- a/src/gui/EditWidgetProperties.cpp
+++ b/src/gui/EditWidgetProperties.cpp
@@ -116,6 +116,6 @@ void EditWidgetProperties::update()
             m_customDataModel->appendRow(QList<QStandardItem*>()
                                          << new QStandardItem(key) << new QStandardItem(m_customData->value(key)));
         }
-        m_ui->removeCustomDataButton->setEnabled(!m_customData->isEmpty());
+        m_ui->removeCustomDataButton->setEnabled(m_ui->customDataTable->selectionModel()->hasSelection());
     }
 }