diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp
index 7b2f894b681842068999821d2efb926aae31c917..8cb7529719678764a455bdfbcc4f0e76b838f168 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 9a86aa4dd582de2811e5bec8ef3eea72ee37a74e..6eaa3c7fb1c0ecc112277f2e287c79c018c6a091 100644
--- a/obs/forms/OBSWindows.fbp
+++ b/obs/forms/OBSWindows.fbp
@@ -8051,7 +8051,7 @@
                                 <property name="close_button">1</property>
                                 <property name="context_help"></property>
                                 <property name="context_menu">1</property>
-                                <property name="default">0</property>
+                                <property name="default">1</property>
                                 <property name="default_pane">0</property>
                                 <property name="dock">Dock</property>
                                 <property name="dock_fixed">0</property>