diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp
index 208664109..6f4207131 100644
--- a/src/LabelDialog.cpp
+++ b/src/LabelDialog.cpp
@@ -350,7 +350,7 @@ bool LabelDialog::Show(bool show)
 {
    bool ret = wxDialogWrapper::Show(show);
 
-   mGrid->SetFocus();   // Required (at least on Linux).
+   mGrid->SetFocus();   // Required for Linux and Mac.
 
    // Set initial row
    // (This will not work until the grid is actually displayed)
diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp
index a12d4de4d..2c1e6245c 100644
--- a/src/LabelTrack.cpp
+++ b/src/LabelTrack.cpp
@@ -3072,8 +3072,9 @@ void LabelTrack::DoEditLabels
                    lt, index,
                    viewInfo, rate,
                    format, freqFormat);
-
-   dlg.Raise();   // Required on Linux: bug 2011
+#ifdef __WXGTK__
+   dlg.Raise();
+#endif
 
    if (dlg.ShowModal() == wxID_OK) {
       project.PushState(_("Edited labels"), _("Label"));