diff --git a/src/Charts/LTMTool.cpp b/src/Charts/LTMTool.cpp
index b338b20ce..79294db92 100644
--- a/src/Charts/LTMTool.cpp
+++ b/src/Charts/LTMTool.cpp
@@ -156,7 +156,6 @@ LTMTool::LTMTool(Context *context, LTMSettings *settings) : QWidget(context->mai
     presetLayout->addWidget(charts, 0,0);
 
     applyButton = new QPushButton(tr("Apply")); // connected in LTMWindow.cpp (weird!?)
-    applyButton->setDefault(true);
     newButton = new QPushButton(tr("Add Current"));
     connect(newButton, SIGNAL(clicked()), this, SLOT(addCurrent()));
 
@@ -2097,6 +2096,7 @@ EditMetricDetailDialog::EditMetricDetailDialog(Context *context, LTMTool *ltmToo
 
     QLabel *color = new QLabel(tr("Color"));
     curveColor = new QPushButton(this);
+    curveColor->setAutoDefault(false);
 
     QLabel *fill = new QLabel(tr("Fill curve"));
     fillCurve = new QCheckBox("", this);
@@ -2195,8 +2195,9 @@ EditMetricDetailDialog::EditMetricDetailDialog(Context *context, LTMTool *ltmToo
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addStretch();
     applyButton = new QPushButton(tr("&OK"), this);
-    applyButton->setDefault(true);
+    applyButton->setAutoDefault(false);
     cancelButton = new QPushButton(tr("&Cancel"), this);
+    cancelButton->setAutoDefault(false);
     buttonLayout->addWidget(cancelButton);
     buttonLayout->addWidget(applyButton);
     mainLayout->addLayout(buttonLayout);