diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index 7f633c7fd0..2d27b470ce 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -140,6 +140,11 @@ void DatabaseOpenWidget::toggleHardwareKeyComponent(bool state)
     m_ui->hardwareKeyProgress->setVisible(false);
     m_ui->hardwareKeyComponent->setVisible(state);
     m_ui->hardwareKeyCombo->setVisible(state && m_ui->hardwareKeyCombo->count() != 1);
+
+    m_ui->noHardwareKeysFoundLabel->setText(YubiKey::instance()->findConnectedKeys()
+                                                ? tr("Hardware keys found, but no slots are configured")
+                                                : tr("No hardware keys detected"));
+
     m_ui->noHardwareKeysFoundLabel->setVisible(!state && m_manualHardwareKeyRefresh);
     if (!state) {
         m_ui->useHardwareKeyCheckBox->setChecked(false);
diff --git a/src/gui/DatabaseOpenWidget.ui b/src/gui/DatabaseOpenWidget.ui
index 1ef04a5287..258b7d539d 100644
--- a/src/gui/DatabaseOpenWidget.ui
+++ b/src/gui/DatabaseOpenWidget.ui
@@ -384,7 +384,7 @@
                   </sizepolicy>
                  </property>
                  <property name="text">
-                  <string>No hardware keys found.</string>
+                  <string>No hardware keys detected</string>
                  </property>
                  <property name="margin">
                   <number>1</number>