diff --git a/app/static/locales/en/app.json b/app/static/locales/en/app.json
index b9dd35fb..dbcbdea0 100644
--- a/app/static/locales/en/app.json
+++ b/app/static/locales/en/app.json
@@ -67,7 +67,8 @@
     "ask-remove-asset": "Remove \"{{filename}}\" from the timeline?",
     "global-shortcut-reserved": "This shortcut is reserved by the system!",
     "type-shortcut-here": "Type shortcut here...",
-    "add-event": "Add event"
+    "add-event": "Add event",
+    "confirm-quit": "Do you really want to leave Marv?"
   },
   "words": {
     "settings": "settings",
diff --git a/app/static/locales/es/app.json b/app/static/locales/es/app.json
index ae527393..e6d11f3f 100644
--- a/app/static/locales/es/app.json
+++ b/app/static/locales/es/app.json
@@ -67,7 +67,8 @@
     "ask-remove-asset": "¿Eliminar \"{{filename}}\" de la línea de tiempo?",
     "global-shortcut-reserved": "Este acceso directo está reservado por el sistema!",
     "type-shortcut-here": "Escriba el acceso directo aquí...",
-    "add-event": "Añadir evento"
+    "add-event": "Añadir evento",
+    "confirm-quit": "¿De verdad quieres dejar Marv?"
   },
   "words": {
     "settings": "opciones",
diff --git a/app/static/locales/fr/app.json b/app/static/locales/fr/app.json
index 9fecfb08..6294fe67 100644
--- a/app/static/locales/fr/app.json
+++ b/app/static/locales/fr/app.json
@@ -67,7 +67,8 @@
     "ask-remove-asset": "Supprimer \"{{filename}}\" de la timeline ?",
     "global-shortcut-reserved": "Ce raccourci est réservé par le système!",
     "type-shortcut-here": "Tapez le raccourci ici...",
-    "add-event": "Ajouter un évènement"
+    "add-event": "Ajouter un évènement",
+    "confirm-quit": "Voulez vous vraiment quitter Marv ?"
   },
   "words": {
     "settings": "options",
diff --git a/front-src/client/components/Dashboard/Drawer.svelte b/front-src/client/components/Dashboard/Drawer.svelte
index 224d17b1..a7e00762 100644
--- a/front-src/client/components/Dashboard/Drawer.svelte
+++ b/front-src/client/components/Dashboard/Drawer.svelte
@@ -1,8 +1,8 @@
 <script>
   import { electron } from "@/stores/app";
   import Donate from "../App/Donate.svelte";
+  import QuitButton from "./QuitButton.svelte";
   import { drawer, hide } from "@/stores/drawer";
-  // import OpenEditMode from "./Drawer/OpenEditMode.svelte";
   import clickoutside from "@/libs/svelte/click-outside";
   import HelpLinks from "@/components/App/HelpLinks.svelte";
   import OpenOnStartup from "@/components/App/OpenOnStartup.svelte";
@@ -21,7 +21,6 @@
     style="top:{top}px; max-width:300px;"
     class="absolute z-50 right-0 bottom-0 flex flex-col bg-dark shadow overflow-y-auto"
   >
-    <!-- <OpenEditMode on:click="{hide}" /> -->
     <LanguageSelect />
     <div class="flex flex-col divide-y divide-gray-800 divide-opacity-50">
       <OpenOnStartup />
@@ -29,6 +28,7 @@
       <TwitchConnectAtStartup />
       <CheckUpdateCheckbox />
     </div>
+    <QuitButton />
     <HelpLinks />
     <div class="flex-auto"></div>
     <Donate />
diff --git a/front-src/client/components/Dashboard/QuitButton.svelte b/front-src/client/components/Dashboard/QuitButton.svelte
new file mode 100644
index 00000000..19449daf
--- /dev/null
+++ b/front-src/client/components/Dashboard/QuitButton.svelte
@@ -0,0 +1,24 @@
+<script>
+  import app from "@/api/app";
+  import { _ } from "@/libs/i18next";
+  import Button from "@/components/UI/Button.svelte";
+  import ConfirmModal from "@/components/UI/ConfirmModal.svelte";
+
+  let confirmModal = false;
+
+  function quit() {
+    confirmModal = true;
+  }
+
+  function onConfirm({ detail }) {
+    detail && app.quit();
+    confirmModal = false;
+  }
+</script>
+
+<Button class="bg-red-600" on:click="{quit}">{_('words.quit')}</Button>
+<ConfirmModal
+  opened="{confirmModal}"
+  on:confirm="{onConfirm}"
+  question="{_('sentences.confirm-quit')}"
+/>