diff --git a/aegisub/dialog_properties.cpp b/aegisub/dialog_properties.cpp
index 3f8a4d049..11bb1022f 100644
--- a/aegisub/dialog_properties.cpp
+++ b/aegisub/dialog_properties.cpp
@@ -147,6 +147,7 @@ DialogProperties::DialogProperties (wxWindow *parent)
 	// Button sizer
 	wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
 	ButtonSizer->AddButton(new wxButton(this,wxID_OK));
+	ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL));
 	ButtonSizer->AddButton(new HelpButton(this,_T("Properties")));
 	ButtonSizer->Realize();
 
diff --git a/aegisub/dialog_spellchecker.cpp b/aegisub/dialog_spellchecker.cpp
index a6195c39a..9d83b3c77 100644
--- a/aegisub/dialog_spellchecker.cpp
+++ b/aegisub/dialog_spellchecker.cpp
@@ -112,6 +112,9 @@ DialogSpellChecker::DialogSpellChecker(wxFrame *parent)
 	topSizer->Add(replaceWord,1,wxEXPAND);
 	topSizer->AddGrowableCol(1,1);
 
+	// List
+	suggestList = new wxListBox(this,LIST_SUGGESTIONS,wxDefaultPosition,wxSize(300,150));
+
 	// Actions sizer
 	wxSizer *actionsSizer = new wxBoxSizer(wxVERTICAL);
 	actionsSizer->Add(new wxButton(this,BUTTON_REPLACE,_("Replace")),0,wxEXPAND | wxBOTTOM,5);
@@ -123,7 +126,6 @@ DialogSpellChecker::DialogSpellChecker(wxFrame *parent)
 	actionsSizer->AddStretchSpacer(1);
 
 	// Bottom sizer
-	suggestList = new wxListBox(this,LIST_SUGGESTIONS,wxDefaultPosition,wxSize(300,150));
 	language = new wxComboBox(this,LIST_LANGUAGES,_T(""),wxDefaultPosition,wxDefaultSize,langNames,wxCB_DROPDOWN | wxCB_READONLY);
 	language->SetSelection(curLangPos);
 	wxFlexGridSizer *botSizer = new wxFlexGridSizer(2,2,5,5);
diff --git a/aegisub/dialog_styling_assistant.cpp b/aegisub/dialog_styling_assistant.cpp
index 852afeea5..66313cd32 100644
--- a/aegisub/dialog_styling_assistant.cpp
+++ b/aegisub/dialog_styling_assistant.cpp
@@ -115,12 +115,12 @@ wxDialog (parent, -1, _("Styling assistant"), wxDefaultPosition, wxDefaultSize,
 
 	// Button sizer
 	wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
-	ButtonSizer->AddButton(new wxButton(this,wxID_OK));
 	wxButton *PlayButton = new wxButton(this,BUTTON_PLAY,_("Play Audio"));
 	PlayButton->Enable(audio->loaded);
 	ButtonSizer->AddButton(PlayButton);
+	ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL));
 	ButtonSizer->AddButton(new HelpButton(this,_T("Styling Assistant")));
-	ButtonSizer->SetNegativeButton(PlayButton);
+	ButtonSizer->SetAffirmativeButton(PlayButton);
 	ButtonSizer->Realize();
 
 	// Main sizer