diff --git a/src/Project.cpp b/src/Project.cpp
index df65fc3c8..5a4162592 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -2161,11 +2161,9 @@ void AudacityProject::OnActivate(wxActivateEvent & event)
          mLastFocusedWindow->SetFocus();
       }
       else {
-         if (mTrackPanel->GetFocusedTrack()) {
+         if (mTrackPanel) {
             mTrackPanel->SetFocus();
          }
-         else
-            mRuler->SetFocus();
       }
       // No longer need to remember the last focused window
       mLastFocusedWindow = NULL;