diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 1c84cc10c5..5be7f25396 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -111,6 +111,12 @@ int EDIT_TOOL::Main( TOOL_EVENT& aEvent )
             break;          // Finish
         }
 
+        else if( evt->Action() == TA_UNDO_REDO )
+        {
+            unselect = true;
+            break;
+        }
+
         // Dispatch TOOL_ACTIONs
         else if( evt->Category() == TC_COMMAND )
         {