diff --git a/include/commit.h b/include/commit.h
index 243f2e360b..62fbf7d98c 100644
--- a/include/commit.h
+++ b/include/commit.h
@@ -127,7 +127,7 @@ public:
     COMMIT& Stage( const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED );
 
     ///> Executes the changes.
-    virtual void Push( const wxString& aMessage = wxT( "A commit" ) ) = 0;
+    virtual void Push( const wxString& aMessage = wxT( "A commit" ), bool aCreateUndoEntry = true ) = 0;
 
     ///> Revertes the commit by restoring the modifed items state.
     virtual void Revert() = 0;
diff --git a/pcbnew/board_commit.cpp b/pcbnew/board_commit.cpp
index bad4616646..bd1d302bec 100644
--- a/pcbnew/board_commit.cpp
+++ b/pcbnew/board_commit.cpp
@@ -53,7 +53,7 @@ BOARD_COMMIT::~BOARD_COMMIT()
 }
 
 
-void BOARD_COMMIT::Push( const wxString& aMessage )
+void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry)
 {
     // Objects potentially interested in changes:
     PICKED_ITEMS_LIST undoList;
@@ -91,10 +91,13 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
                 assert( ent.m_item->Type() == PCB_MODULE_T );
                 assert( ent.m_copy->Type() == PCB_MODULE_T );
 
-                ITEM_PICKER itemWrapper( ent.m_item, UR_CHANGED );
-                itemWrapper.SetLink( ent.m_copy );
-                undoList.PushItem( itemWrapper );
-                frame->SaveCopyInUndoList( undoList, UR_CHANGED );
+        		if( aCreateUndoEntry )
+                {
+                    ITEM_PICKER itemWrapper( ent.m_item, UR_CHANGED );
+                    itemWrapper.SetLink( ent.m_copy );
+                    undoList.PushItem( itemWrapper );
+                    frame->SaveCopyInUndoList( undoList, UR_CHANGED );
+                }
 
                 savedModules.insert( ent.m_item );
                 static_cast<MODULE*>( ent.m_item )->SetLastEditTime();
@@ -107,7 +110,10 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
             {
                 if( !m_editModules )
                 {
-                    undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) );
+                    if( aCreateUndoEntry )
+					{
+						undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) );
+					}
 
                     if( !( changeFlags & CHT_DONE ) )
                         board->Add( boardItem );
@@ -135,7 +141,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
 
             case CHT_REMOVE:
             {
-                if( !m_editModules )
+                if( !m_editModules && aCreateUndoEntry )
                 {
                     undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) );
                 }
@@ -241,7 +247,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
 
             case CHT_MODIFY:
             {
-                if( !m_editModules )
+                if( !m_editModules && aCreateUndoEntry )
                 {
                     ITEM_PICKER itemWrapper( boardItem, UR_CHANGED );
                     assert( ent.m_copy );
@@ -266,7 +272,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
         }
     }
 
-    if( !m_editModules )
+    if( !m_editModules && aCreateUndoEntry )
         frame->SaveCopyInUndoList( undoList, UR_UNSPECIFIED );
 
     if( TOOL_MANAGER* toolMgr = frame->GetToolManager() )
diff --git a/pcbnew/board_commit.h b/pcbnew/board_commit.h
index c1c3e38b5b..197bbfbbea 100644
--- a/pcbnew/board_commit.h
+++ b/pcbnew/board_commit.h
@@ -40,7 +40,7 @@ public:
     BOARD_COMMIT( PCB_BASE_FRAME* aFrame );
     virtual ~BOARD_COMMIT();
 
-    virtual void Push( const wxString& aMessage = wxT( "A commit" ) ) override;
+    virtual void Push( const wxString& aMessage = wxT( "A commit" ), bool aCreateUndoEntry = true ) override;
     virtual void Revert() override;
 
 private: