diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 156f2710cf..9cabbfef4c 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -347,19 +347,17 @@ void SCH_SHEET::SwapData( SCH_ITEM* aItem )
 void SCH_SHEET::SetFields( const std::vector<SCH_FIELD>& aFields )
 {
     m_fields = aFields;
-    int next_id = SHEET_MANDATORY_FIELDS;
 
-    for( int ii = 0; ii < int( m_fields.size() ); )
-    {
-        if( m_fields[ii].GetId() < 0 || m_fields[ii].GetId() >= ssize_t( m_fields.size() ) )
-            m_fields[ii].SetId( next_id++ );
+    // Ensure that mandatory fields are at the beginning
+    std::sort( m_fields.begin(), m_fields.end(),
+               []( const SCH_FIELD& a, const SCH_FIELD& b )
+               {
+                   return a.GetId() < b.GetId();
+               } );
 
-        if( m_fields[ii].GetId() != ii )
-            std::swap( m_fields[ii], m_fields[m_fields[ii].GetId()]);
-
-        if( m_fields[ii].GetId() == ii )
-            ++ii;
-    }
+    // After mandatory fields, the rest should be sequential user fields
+    for( int ii = SHEET_MANDATORY_FIELDS; ii < static_cast<int>( m_fields.size() ); ++ii )
+        m_fields[ii].SetId( ii );
 
     // Make sure that we get the UNIX variant of the file path
     SetFileName( m_fields[SHEETFILENAME].GetText() );