diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 5ea8f891cc..4e56e65026 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -441,10 +441,10 @@ int EDIT_TOOL::Move( const TOOL_EVENT& aEvent )
             break;                // Finish
         }
 
-        else if( evt->Action() == TA_UNDO_REDO_PRE )
+        else if( evt->IsAction( &ACTIONS::undo ) )
         {
-            unselect = true;
-            break;
+            restore_state = true; // Perform undo locally
+            break;                // Finish
         }
 
         // Dispatch TOOL_ACTIONs