diff --git a/main.js b/main.js
index eec8abd..cf9aaa3 100644
--- a/main.js
+++ b/main.js
@@ -429,7 +429,7 @@ function createWindow(status) {
 					shepherd.log('Closing Main Window...');
 					shepherd.writeLog('exiting app...');
 
-					shepherd.quitKomodod(1000);
+					shepherd.quitKomodod(appConfig.cliStopTimeout);
 
 					const result = 'Closing daemons: done';
 
@@ -480,7 +480,7 @@ function createWindow(status) {
 				closeApp();
 			} else {
 				createAppCloseWindow();
-				shepherd.quitKomodod(1000);
+				shepherd.quitKomodod(appConfig.cliStopTimeout);
 				_appClosingInterval = setInterval(function() {
 					if (!Object.keys(shepherd.coindInstanceRegistry).length) {
 						closeApp();
diff --git a/routes/appConfig.js b/routes/appConfig.js
index 93d5549..a6420fe 100644
--- a/routes/appConfig.js
+++ b/routes/appConfig.js
@@ -14,6 +14,7 @@ const appConfig = {
     dex: {
       walletUnlockTimeout: 3600,
     },
+    cliStopTimeout: 1000,
   },
   schema: {
     host: {
@@ -91,6 +92,11 @@ const appConfig = {
         type: 'number',
       },
     },
+    cliStopTimeout: {
+      display: true,
+      displayName: 'CLI stop timeout',
+      type: 'number',
+    },
   },
 };