diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp
index ccd7fa952c..eed93540f6 100644
--- a/eeschema/tools/sch_drawing_tools.cpp
+++ b/eeschema/tools/sch_drawing_tools.cpp
@@ -1078,14 +1078,13 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
                     }
                 }
 
-                item->AutoplaceFields( /* aScreen */ nullptr, /* aManual */ false );
-
                 // Restore cursor after dialog
                 controls->WarpCursor( controls->GetCursorPosition(), true );
 
                 if( item )
                 {
                     item->SetFlags( IS_NEW | IS_MOVED );
+                    item->AutoplaceFields( /* aScreen */ nullptr, /* aManual */ false );
                     updatePreview();
 
                     // update the cursor so it looks correct before another event