diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index 9628d0a0b..c24686073 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -663,8 +663,8 @@ int ToolManager::FilterEvent(wxEvent &event)
            top == mParent )
          mLastFocus = window;
    }
-   else if (event.GetEventType() == wxEVT_CLOSE_WINDOW) {
-      auto &closeEvent = static_cast<wxCloseEvent&>(event);
+   else if (event.GetEventType() == wxEVT_DESTROY) {
+      auto &closeEvent = static_cast<wxWindowDestroyEvent&>(event);
       auto window = closeEvent.GetEventObject();
       if (window == mLastFocus)
          // Avoid a dangling pointer!