diff --git a/src/Tags.cpp b/src/Tags.cpp
index 6c085555a..dd2b7fd15 100644
--- a/src/Tags.cpp
+++ b/src/Tags.cpp
@@ -1365,6 +1365,9 @@ void TagsEditor::DoCancel(bool escKey)
       // To avoid memory leak, don't forget DecRef()!
       editor->DecRef();
       mGrid->HideCellEditControl();
+#if defined(__WXMSW__)
+      return;
+#endif
    }
 
    auto focus = wxWindow::FindFocus();
diff --git a/src/Tags.h b/src/Tags.h
index c02bc4f0b..3111f2542 100644
--- a/src/Tags.h
+++ b/src/Tags.h
@@ -142,7 +142,9 @@ class TagsEditor final : public wxDialogWrapper
 
    virtual ~TagsEditor();
 
+#if !defined(__WXMSW__)
    bool IsEscapeKey(const wxKeyEvent& /*event*/) override { return false; }
+#endif
 
    void PopulateOrExchange(ShuttleGui & S);