diff --git a/eeschema/dialogs/dialog_fields_editor_global.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp
index 8c8075bd82..7f934f56d3 100644
--- a/eeschema/dialogs/dialog_fields_editor_global.cpp
+++ b/eeschema/dialogs/dialog_fields_editor_global.cpp
@@ -887,13 +887,14 @@ bool DIALOG_FIELDS_EDITOR_GLOBAL::TransferDataFromWindow()
     SCH_SHEET_PATH currentSheet = m_parent->GetCurrentSheet();
 
     m_dataModel->ApplyData();
-    m_parent->SyncView();
-    m_parent->OnModify();
 
     // Reset the view to where we left the user
     m_parent->SetCurrentSheet( currentSheet );
+    m_parent->SyncView();
     m_parent->Refresh();
 
+    m_parent->OnModify();
+
     return true;
 }