diff --git a/src/HistoryWindow.cpp b/src/HistoryWindow.cpp
index f2dc168ee..e4b08bea3 100644
--- a/src/HistoryWindow.cpp
+++ b/src/HistoryWindow.cpp
@@ -42,7 +42,6 @@ enum {
 };
 
 BEGIN_EVENT_TABLE(HistoryWindow, wxDialog)
-   EVT_SHOW(HistoryWindow::OnShow)
    EVT_SIZE(HistoryWindow::OnSize)
    EVT_CLOSE(HistoryWindow::OnCloseWindow)
    EVT_LIST_ITEM_SELECTED(wxID_ANY, HistoryWindow::OnItemSelected)
@@ -116,7 +115,9 @@ HistoryWindow::HistoryWindow(AudacityProject *parent, UndoManager *manager):
    S.EndVerticalLay();
    // ----------------------- End of main section --------------
 
-   DoUpdate();
+   // Vaughan, 2010-07-30: AudacityProject::OnHistory always calls Show() then 
+   // HistoryWindow::UpdateDisplay, so no need to do it here.
+   //    DoUpdate();
    mList->SetMinSize(mList->GetSize());
    Fit();
    SetMinSize(GetSize());
@@ -237,26 +238,8 @@ void HistoryWindow::OnSize(wxSizeEvent & event)
    mList->EnsureVisible(mSelected);
 }
 
-void HistoryWindow::OnShow(wxShowEvent & event)
-{
-   if (event.GetShow())
-      UpdateDisplay();
-}
-
 void HistoryWindow::OnChar(wxKeyEvent &event)
 {
    event.Skip(false);
    return;
 }
-
-// Indentation settings for Vim and Emacs and unique identifier for Arch, a
-// version control system. Please do not modify past this point.
-//
-// Local Variables:
-// c-basic-offset: 3
-// indent-tabs-mode: nil
-// End:
-//
-// vim: et sts=3 sw=3
-// arch-tag: a32dc48c-50da-4cda-90a6-b5aa4fd7673e
-
diff --git a/src/HistoryWindow.h b/src/HistoryWindow.h
index 980ba4efa..63ddcdd9f 100644
--- a/src/HistoryWindow.h
+++ b/src/HistoryWindow.h
@@ -35,7 +35,6 @@ class HistoryWindow :public wxDialog {
    void DoUpdate();
    void UpdateLevels();
 
-   void OnShow(wxShowEvent & event);
    void OnSize(wxSizeEvent & event);
    void OnCloseWindow(wxCloseEvent & WXUNUSED(event));
    void OnChar(wxKeyEvent & event);
diff --git a/src/Menus.cpp b/src/Menus.cpp
index b8272eb72..0623cf381 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -4360,8 +4360,8 @@ void AudacityProject::OnHistory()
 {
    if (!mHistoryWindow)
       mHistoryWindow = new HistoryWindow(this, &mUndoManager);
-
-   mHistoryWindow->Show(true);
+   mHistoryWindow->Show();
+   mHistoryWindow->Raise();
    mHistoryWindow->UpdateDisplay();
 }
 
@@ -4369,7 +4369,6 @@ void AudacityProject::OnKaraoke()
 {
    if (!mLyricsWindow)
       mLyricsWindow = new LyricsWindow(this);
-   wxASSERT(mLyricsWindow);
    mLyricsWindow->Show();
    mLyricsWindow->Raise();
 }