diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp
index a7ae9bff0d..bf9df13881 100644
--- a/pcbnew/xchgmod.cpp
+++ b/pcbnew/xchgmod.cpp
@@ -408,6 +408,7 @@ bool DIALOG_EXCHANGE_MODULE::Change_1_Module( MODULE*            aModule,
         return false;
     }
 
+    m_parent->Exchange_Module( aModule, newModule, aUndoPickList );
     m_parent->GetBoard()->Add( newModule, ADD_APPEND );
 
     if( aModule == m_currentModule )
@@ -415,8 +416,6 @@ bool DIALOG_EXCHANGE_MODULE::Change_1_Module( MODULE*            aModule,
 
     m_WinMessages->AppendText( wxT( " OK\n" ) );
 
-    m_parent->Exchange_Module( aModule, newModule, aUndoPickList );
-
     return true;
 }