diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index 7e4e4a0f2e..f4b824d584 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -630,6 +630,9 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
 
         item->SetFlags( IS_NEW | IS_MOVED );
         m_frame->AddItemToScreenAndUndoList( (SCH_ITEM*) item, i > 0 );
+
+        // Reset flags for subsequent move operation
+        item->SetFlags( IS_NEW | IS_MOVED );
     }
 
     if( sheetsPasted )
diff --git a/eeschema/tools/sch_move_tool.cpp b/eeschema/tools/sch_move_tool.cpp
index 22e80ac7ed..78a2956a44 100644
--- a/eeschema/tools/sch_move_tool.cpp
+++ b/eeschema/tools/sch_move_tool.cpp
@@ -253,6 +253,7 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
                     if( item->IsNew() || ( item->GetParent() && item->GetParent()->IsSelected() ) )
                     {
                         // already saved to undo
+                        appendUndo = true;
                     }
                     else
                     {