diff --git a/src/app/editor/code/assembly_editor.cc b/src/app/editor/code/assembly_editor.cc
index cd435d0a..bc0acd2f 100644
--- a/src/app/editor/code/assembly_editor.cc
+++ b/src/app/editor/code/assembly_editor.cc
@@ -93,6 +93,10 @@ core::FolderItem LoadFolder(const std::string& folder) {
 
 }  // namespace
 
+void AssemblyEditor::OpenFolder(const std::string& folder_path) {
+  current_folder_ = LoadFolder(folder_path);
+}
+
 void AssemblyEditor::Update(bool& is_loaded) {
   ImGui::Begin("Assembly Editor", &is_loaded);
   MENU_BAR()
diff --git a/src/app/editor/code/assembly_editor.h b/src/app/editor/code/assembly_editor.h
index a4c9e9d2..c2d7790c 100644
--- a/src/app/editor/code/assembly_editor.h
+++ b/src/app/editor/code/assembly_editor.h
@@ -47,6 +47,8 @@ class AssemblyEditor : public Editor {
 
   absl::Status Update() override;
 
+  void OpenFolder(const std::string &folder_path);
+
  private:
   void DrawFileMenu();
   void DrawEditMenu();
diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc
index 94743f15..84c737dc 100644
--- a/src/app/editor/master_editor.cc
+++ b/src/app/editor/master_editor.cc
@@ -922,6 +922,10 @@ absl::Status MasterEditor::OpenProject() {
                   ".yaze");
   manager.Save();
 
+  assembly_editor_.OpenFolder(current_project_.code_folder_);
+
+  current_project_.project_opened_ = true;
+
   return absl::OkStatus();
 }