diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp
index 7b2f894b6..8cb752971 100644
--- a/obs/forms/OBSWindows.cpp
+++ b/obs/forms/OBSWindows.cpp
@@ -849,6 +849,7 @@ NameDialogBase::NameDialogBase( wxWindow* parent, wxWindowID id, const wxString&
bSizer45 = new wxBoxSizer( wxHORIZONTAL );
okButton = new wxButton( this, wxID_ANY, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ okButton->SetDefault();
bSizer45->Add( okButton, 0, wxALL, 5 );
cancelButton = new wxButton( this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp
index 9a86aa4dd..6eaa3c7fb 100644
--- a/obs/forms/OBSWindows.fbp
+++ b/obs/forms/OBSWindows.fbp
@@ -8051,7 +8051,7 @@
1
1
- 0
+ 1
0
Dock
0