diff --git a/src/browser.js b/src/browser.js
index 50beae7e69..2069c8022f 100644
--- a/src/browser.js
+++ b/src/browser.js
@@ -6,13 +6,14 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import child_process from 'child_process';
+let Promise = require('bluebird');
 
 process.env.NODE_PATH = path.join(__dirname, 'node_modules');
 process.env.RESOURCES_PATH = path.join(__dirname, '/../resources');
 if (process.platform !== 'win32') {
   process.env.PATH = '/usr/local/bin:' + process.env.PATH;
 }
-
+var exiting = false;
 var size = {}, settingsjson = {};
 try {
   size = JSON.parse(fs.readFileSync(path.join(app.getPath('userData'), 'size')));
@@ -49,9 +50,15 @@ app.on('ready', function () {
 
 
   if (os.platform() === 'win32') {
-    mainWindow.on('close', function () {
+    mainWindow.on('close', function (e) {
       mainWindow.webContents.send('application:quitting');
-      return true;
+      if(!exiting){
+        Promise.delay(1000).then(function(){
+          mainWindow.close();
+        });
+        exiting = true;
+        e.preventDefault();
+      }
     });
 
     app.on('window-all-closed', function () {