diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index 512be512a..2ac80881e 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -177,6 +177,7 @@ AboutDialog::AboutDialog(wxWindow * parent)
                wxDefaultPosition, wxDefaultSize,
                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
+   SetName(GetTitle());
    this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground ));
    icon = NULL;
    ShuttleGui S( this, eIsCreating );
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 6dea281c8..50dd84eac 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -1056,6 +1056,7 @@ void AudacityApp::GenerateCrashReport(wxDebugReport::Context ctx)
                               _("Audacity Support Data"),
                               rpt.GetCompressedFileName(),
                               wxOK | wxCENTER);
+      dlg.SetName(dlg.GetTitle());
       dlg.ShowModal();
 
       wxLogMessage(wxT("Report generated to: %s"),
diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp
index 3f64bb2e6..41f307293 100644
--- a/src/AudacityLogger.cpp
+++ b/src/AudacityLogger.cpp
@@ -165,6 +165,7 @@ void AudacityLogger::Show(bool show)
 
    // This is the first use, so create the frame
    wxFrame *frame = new wxFrame(NULL, wxID_ANY, _("Audacity Log"));
+   frame->SetName(frame->GetTitle());
    frame->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
    // loads either the XPM or the windows resource, depending on the platform
diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp
index 13065c524..dd7d4024d 100644
--- a/src/FreqWindow.cpp
+++ b/src/FreqWindow.cpp
@@ -200,6 +200,8 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
    mBitmap(NULL),
    mAnalyst(new SpectrumAnalyst())
 {
+   SetName(GetTitle());
+
    mMouseX = 0;
    mMouseY = 0;
    mRate = 0;
diff --git a/src/HistoryWindow.cpp b/src/HistoryWindow.cpp
index c8bd11db7..0fd89c0f5 100644
--- a/src/HistoryWindow.cpp
+++ b/src/HistoryWindow.cpp
@@ -54,6 +54,8 @@ HistoryWindow::HistoryWindow(AudacityProject *parent, UndoManager *manager):
       wxDefaultPosition, wxDefaultSize,
       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
 {
+   SetName(GetTitle());
+
    mManager = manager;
    mProject = parent;
    mSelected = 0;
diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp
index 12d1d9ae8..caf5402a8 100644
--- a/src/LabelDialog.cpp
+++ b/src/LabelDialog.cpp
@@ -105,6 +105,8 @@ LabelDialog::LabelDialog(wxWindow *parent,
   mRate(rate),
   mFormat(format)
 {
+   SetName(GetTitle());
+
    // Create the main sizer
    wxBoxSizer *vs = new wxBoxSizer(wxVERTICAL);
 
diff --git a/src/Menus.cpp b/src/Menus.cpp
index bda2b556f..b169970a7 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -6356,6 +6356,7 @@ void AudacityProject::OnAudioDeviceInfo()
    wxString info = gAudioIO->GetDeviceInfo();
 
    wxDialog dlg(this, wxID_ANY, wxString(_("Audio Device Info")));
+   dlg.SetName(dlg.GetTitle());
    ShuttleGui S(&dlg, eIsCreating);
 
    wxTextCtrl *text;
@@ -6488,6 +6489,7 @@ void AudacityProject::OnResample()
    while (true)
    {
       wxDialog dlg(this, wxID_ANY, wxString(_("Resample")));
+      dlg.SetName(dlg.GetTitle());
       ShuttleGui S(&dlg, eIsCreating);
       wxString rate;
       wxArrayString rates;
diff --git a/src/Tags.cpp b/src/Tags.cpp
index b6feb5f58..297d3a33f 100644
--- a/src/Tags.cpp
+++ b/src/Tags.cpp
@@ -664,6 +664,8 @@ TagsEditor::TagsEditor(wxWindow * parent,
    mEditTitle(editTitle),
    mEditTrack(editTrack)
 {
+   SetName(GetTitle());
+
    names[0] = LABEL_ARTIST;
    names[1] = LABEL_TITLE;
    names[2] = LABEL_ALBUM;
diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp
index 438ed44ad..1671a3b2e 100644
--- a/src/TimerRecordDialog.cpp
+++ b/src/TimerRecordDialog.cpp
@@ -70,6 +70,8 @@ TimerRecordDialog::TimerRecordDialog(wxWindow* parent)
 : wxDialog(parent, -1, _("Audacity Timer Record"), wxDefaultPosition,
            wxDefaultSize, wxCAPTION)
 {
+   SetName(GetTitle());
+
    m_DateTime_Start = wxDateTime::UNow();
    long seconds; // default duration is 1 hour = 3600 seconds
    gPrefs->Read(wxT("/TimerRecord/LastDuration"), &seconds, 3600);
diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp
index 4c95b556b..9b1332873 100644
--- a/src/effects/Contrast.cpp
+++ b/src/effects/Contrast.cpp
@@ -227,6 +227,8 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
   wxDialog(parent, id, title, pos, wxDefaultSize,
      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX )
 {
+   SetName(GetTitle());
+
    foregrounddB = 1234.0;
    backgrounddB = 1234.0;
 
diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp
index 71bc6859d..b8a1df1e0 100644
--- a/src/import/ImportPCM.cpp
+++ b/src/import/ImportPCM.cpp
@@ -236,6 +236,7 @@ static wxString AskCopyOrEdit()
    if (oldAskPref) {
       wxString newCopyPref = wxT("copy");
       wxDialog dialog(NULL, -1, wxString(_("Warning")));
+      dialog.SetName(dialog.GetTitle());
 
       wxBoxSizer *vbox = new wxBoxSizer(wxVERTICAL);
       dialog.SetSizer(vbox);
diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp
index 4215c52f8..c842eda5d 100644
--- a/src/prefs/PrefsDialog.cpp
+++ b/src/prefs/PrefsDialog.cpp
@@ -92,6 +92,7 @@ int wxTreebookExt::ChangeSelection(size_t n) {
    int i = wxTreebook::ChangeSelection(n);
    wxString Temp = GetPageText( n );
    ((wxDialog*)GetParent())->SetTitle( Temp );
+   ((wxDialog*)GetParent())->SetName( Temp );
    return i;
 };
 
@@ -100,6 +101,7 @@ int wxTreebookExt::SetSelection(size_t n)
    int i = wxTreebook::SetSelection(n);
    wxString Temp = wxString(_("Preferences: ")) + GetPageText( n );
    ((wxDialog*)GetParent())->SetTitle( Temp );
+   ((wxDialog*)GetParent())->SetName( Temp );
    return i;
 }
 
diff --git a/src/widgets/Warning.cpp b/src/widgets/Warning.cpp
index 64f50bdb0..a552d4579 100644
--- a/src/widgets/Warning.cpp
+++ b/src/widgets/Warning.cpp
@@ -56,6 +56,8 @@ WarningDialog::WarningDialog(wxWindow *parent, wxString message, bool showCancel
             wxDefaultPosition, wxDefaultSize,
             (showCancelButton ? wxDEFAULT_DIALOG_STYLE : wxCAPTION | wxSYSTEM_MENU)) // Unlike wxDEFAULT_DIALOG_STYLE, no wxCLOSE_BOX.
 {
+   SetName(GetTitle());
+
    SetIcon(wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX));
    ShuttleGui S(this, eIsCreating);