diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc
index 12086db2..0c28860c 100644
--- a/src/app/core/controller.cc
+++ b/src/app/core/controller.cc
@@ -244,7 +244,12 @@ void Controller::OnInput() {
   HandleMouseMovement(wheel);
 }
 
-void Controller::OnLoad() { PRINT_IF_ERROR(master_editor_.Update()); }
+void Controller::OnLoad() {
+  if (master_editor_.quit()) {
+    active_ = false;
+  }
+  PRINT_IF_ERROR(master_editor_.Update());
+}
 
 void Controller::DoRender() const {
   ImGui::Render();
diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc
index f3b5190e..cb5f3d69 100644
--- a/src/app/editor/master_editor.cc
+++ b/src/app/editor/master_editor.cc
@@ -411,7 +411,7 @@ void MasterEditor::DrawFileMenu() {
     ImGui::Separator();
 
     if (MenuItem("Quit", "Ctrl+Q")) {
-      // TODO: Implement quit confirmation dialog.
+      quit_ = true;
     }
 
     ImGui::EndMenu();