diff --git a/src/Menus.cpp b/src/Menus.cpp
index 869f2cd00..bda06ff5f 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -4218,10 +4218,6 @@ bool AudacityProject::OnEffect(const PluginID & ID, int flags)
          UpdateMenus(false);
       }
 
-      if (focus != NULL) {
-         focus->SetFocus();
-      }
-
    } );
 
    //double prevEndTime = mTracks->GetEndTime();
@@ -4290,6 +4286,9 @@ bool AudacityProject::OnEffect(const PluginID & ID, int flags)
          //  mTrackPanel->Refresh(false);
    }
    RedrawProject();
+   if (focus != nullptr) {
+      focus->SetFocus();
+   }
    mTrackPanel->EnsureVisible(mTrackPanel->GetFirstSelectedTrack());
 
    mTrackPanel->Refresh(false);