diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp
index 1f017ddfa..fece04e02 100644
--- a/UI/window-basic-filters.cpp
+++ b/UI/window-basic-filters.cpp
@@ -87,8 +87,9 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
 			SLOT(EffectFilterNameEdited(QWidget*,
 					QAbstractItemDelegate::EndEditHint)));
 
-	connect(ui->buttonBox->button(QDialogButtonBox::Close),
-		SIGNAL(clicked()), this, SLOT(close()));
+	QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close);
+	connect(close, SIGNAL(clicked()), this, SLOT(close()));
+	close->setDefault(true);
 
 	ui->buttonBox->button(QDialogButtonBox::Reset)->setText(
 			QTStr("Defaults"));
diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp
index dc35c1fc7..3f7fb3aea 100644
--- a/UI/window-basic-properties.cpp
+++ b/UI/window-basic-properties.cpp
@@ -49,11 +49,14 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 	int cy = (int)config_get_int(App()->GlobalConfig(), "PropertiesWindow",
 			"cy");
 
-	buttonBox->addButton(QTStr("OK"), QDialogButtonBox::AcceptRole);
+	QPushButton *b;
+	b = buttonBox->addButton(QTStr("OK"), QDialogButtonBox::AcceptRole);
 	buttonBox->addButton(QTStr("Cancel"), QDialogButtonBox::RejectRole);
 	buttonBox->addButton(QTStr("Defaults"), QDialogButtonBox::ResetRole);
 	buttonBox->setObjectName(QStringLiteral("buttonBox"));
 
+	b->setDefault(true);
+
 	if (cx > 400 && cy > 400)
 		resize(cx, cy);
 	else