diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index 21daa41c29..e6410b7a62 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -279,9 +279,6 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
         }
 
         {
-            // Ensure netlist is up to date
-            RecalculateConnections();
-
             NETLIST_OBJECT_LIST* net_atoms = BuildNetListBase();
             NETLIST_EXPORTER_KICAD exporter( this, net_atoms, g_ConnectionGraph );
             STRING_FORMATTER formatter;
diff --git a/eeschema/netlist_generator.cpp b/eeschema/netlist_generator.cpp
index 4694aa395a..6f5979b3e0 100644
--- a/eeschema/netlist_generator.cpp
+++ b/eeschema/netlist_generator.cpp
@@ -234,6 +234,9 @@ NETLIST_OBJECT_LIST* SCH_EDIT_FRAME::CreateNetlist( bool aSilent,
 
 NETLIST_OBJECT_LIST* SCH_EDIT_FRAME::BuildNetListBase( bool updateStatusText )
 {
+    // Ensure netlist is up to date
+    RecalculateConnections();
+
     // I own this list until I return it to the new owner.
     std::unique_ptr<NETLIST_OBJECT_LIST> ret( new NETLIST_OBJECT_LIST() );