diff --git a/src/app/editor/editor_manager.cc b/src/app/editor/editor_manager.cc
index 555fd1d0..1606f085 100644
--- a/src/app/editor/editor_manager.cc
+++ b/src/app/editor/editor_manager.cc
@@ -548,13 +548,16 @@ absl::Status EditorManager::LoadAssets() {
   }
   current_editor_set_->overworld_editor_.Initialize();
   current_editor_set_->message_editor_.Initialize();
-
-  auto &sheet_manager = gfx::Arena::Get();
-  ASSIGN_OR_RETURN(*sheet_manager.mutable_gfx_sheets(),
+  ASSIGN_OR_RETURN(*gfx::Arena::Get().mutable_gfx_sheets(),
                    LoadAllGraphicsData(*current_rom_));
-  for (auto &editor : current_editor_set_->active_editors_) {
-    RETURN_IF_ERROR(editor->Load());
-  }
+  RETURN_IF_ERROR(current_editor_set_->overworld_editor_.Load());
+  RETURN_IF_ERROR(current_editor_set_->dungeon_editor_.Load());
+  RETURN_IF_ERROR(current_editor_set_->screen_editor_.Load());
+  RETURN_IF_ERROR(current_editor_set_->settings_editor_.Load());
+  RETURN_IF_ERROR(current_editor_set_->sprite_editor_.Load());
+  RETURN_IF_ERROR(current_editor_set_->message_editor_.Load());
+  RETURN_IF_ERROR(current_editor_set_->music_editor_.Load());
+  RETURN_IF_ERROR(current_editor_set_->palette_editor_.Load());
   return absl::OkStatus();
 }
 
diff --git a/src/app/editor/editor_manager.h b/src/app/editor/editor_manager.h
index 17cf5fb9..c8b393ed 100644
--- a/src/app/editor/editor_manager.h
+++ b/src/app/editor/editor_manager.h
@@ -20,7 +20,6 @@
 #include "app/editor/system/popup_manager.h"
 #include "app/editor/system/settings_editor.h"
 #include "app/emu/emulator.h"
-#include "app/gui/input.h"
 #include "app/rom.h"
 #include "yaze_config.h"