diff --git a/index.html b/index.html
index 356d593..32fc953 100644
--- a/index.html
+++ b/index.html
@@ -123,7 +123,7 @@
         <li><input type='button' value="Get Base Tune" id="btnBasetune" /></li> 
     </ul>
     <ul class="actions">
-        <li><input type='button' value="Exit" id="btnExit" onclick="quit();" /></li>   
+        <li><input type='button' value="Exit" id="btnExit" /></li>   
     </ul>
  </div>
  </section>
@@ -146,7 +146,7 @@
         </div>
         <ul class="actions">
             <li><input type='button' id="btnDownloadBasetune" value="Download tune" /></li>
-            <li><input type='button' value="Exit" id="btnExit" onclick="quit();" /></li> 
+            <li><input type='button' value="Exit" id="btnExit2" /></li> 
         </ul>
     </p>
 </div>
diff --git a/main.js b/main.js
index 8f5741d..8c834ed 100644
--- a/main.js
+++ b/main.js
@@ -309,4 +309,8 @@ ipcMain.on('uploadFW', (e, args) => {
 
 ipcMain.handle('getAppVersion', async (e) => {
   return app.getVersion();
+});
+
+ipcMain.handle('quit-app', () => {
+  app.quit();
 });
\ No newline at end of file
diff --git a/renderer.js b/renderer.js
index 4b9dece..fc408b6 100644
--- a/renderer.js
+++ b/renderer.js
@@ -634,3 +634,11 @@ window.onload = function () {
     
 };
 
+window.addEventListener('DOMContentLoaded', () => {
+  document.getElementById('btnExit').addEventListener('click', () => {
+      ipcRenderer.invoke('quit-app');
+  });
+  document.getElementById('btnExit2').addEventListener('click', () => {
+      ipcRenderer.invoke('quit-app');
+  });
+});
\ No newline at end of file