diff --git a/widgets/logqso.cpp b/widgets/logqso.cpp
index f49274494..e87a88520 100644
--- a/widgets/logqso.cpp
+++ b/widgets/logqso.cpp
@@ -5,6 +5,7 @@
 #include <QSettings>
 #include <QStandardPaths>
 #include <QDir>
+#include <QPushButton>
 
 #include "logbook/logbook.h"
 #include "MessageBox.hpp"
@@ -109,6 +110,15 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString
                         Radio::Frequency dialFreq, bool noSuffix, QString xSent, QString xRcvd)
 {
   if(!isHidden()) return;
+
+  QPushButton* okBtn = ui->buttonBox->button(QDialogButtonBox::Ok);
+  okBtn->setAutoDefault(true);
+  okBtn->setDefault(true);
+  okBtn->setFocus();
+  QPushButton* caBtn = ui->buttonBox->button(QDialogButtonBox::Cancel);
+  caBtn->setAutoDefault(false);
+  caBtn->setDefault(false);
+
   ui->call->setText (hisCall);
   ui->grid->setText (hisGrid);
   ui->name->clear ();