diff --git a/Classes/Editor/MultiEditor/MultiEditorViewController.swift b/Classes/Editor/MultiEditor/MultiEditorViewController.swift
index a6731b19b..57c0f6b0c 100644
--- a/Classes/Editor/MultiEditor/MultiEditorViewController.swift
+++ b/Classes/Editor/MultiEditor/MultiEditorViewController.swift
@@ -387,12 +387,14 @@ extension MultiEditorViewController: EditorControllerDelegate {
                 editor.export { [weak self, editor] result in
                     let _ = editor // strong reference until the export completes
                     self?.exportHandler.handleExport(result, for: idx)
-                    if let selected = self?.selected {
-                        self?.loadEditor(for: selected, current: false)
-                    }
                 }
             }
         })
+
+        if let selected = self.selected {
+            loadEditor(for: selected, current: true)
+        }
+
         return false
     }