diff --git a/common/tool/tool_event.cpp b/common/tool/tool_event.cpp
index 46e25b1e31..6eaf067a08 100644
--- a/common/tool/tool_event.cpp
+++ b/common/tool/tool_event.cpp
@@ -205,7 +205,7 @@ bool TOOL_EVENT::IsSelectionEvent()
 
 bool TOOL_EVENT::IsPointEditor()
 {
-    if( GetCommandStr() && GetCommandStr().get().find( "PointEditor" ) != wxNOT_FOUND )
+    if( GetCommandStr() && GetCommandStr().get().find( "PointEditor" ) != GetCommandStr()->npos )
         return true;
 
     if( GetCommandId() && GetCommandId() == ACTIONS::activatePointEditor.GetId() )
@@ -217,7 +217,7 @@ bool TOOL_EVENT::IsPointEditor()
 
 bool TOOL_EVENT::IsMoveTool()
 {
-    if( GetCommandStr() && GetCommandStr().get().find( "InteractiveMove" ) != wxNOT_FOUND )
+    if( GetCommandStr() && GetCommandStr().get().find( "InteractiveMove" ) != GetCommandStr()->npos )
         return true;
 
     return false;