diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index acb86c60c..ff27331a8 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -2008,6 +2008,8 @@ wxSizer *CreateStdButtonSizer(wxWindow *parent, long buttons, wxButton *extra)
       b = new wxButton( parent, wxID_OK );
       b->SetDefault();
       bs->AddButton( b );
+      // Needs to be default and focus for ENTER to work.
+      b->SetFocus();
    }
 
    if( buttons & eCancelButton )
@@ -2020,6 +2022,8 @@ wxSizer *CreateStdButtonSizer(wxWindow *parent, long buttons, wxButton *extra)
       b = new wxButton( parent, wxID_YES );
       b->SetDefault();
       bs->AddButton( b );
+      // Needs to be default and focus for ENTER to work.
+      b->SetFocus();
    }
 
    if( buttons & eNoButton )