diff --git a/src/login.html b/src/login.html
index 4adeb144..ab5a51d9 100644
--- a/src/login.html
+++ b/src/login.html
@@ -72,10 +72,14 @@ if(process.platform != 'darwin') {
 <script>
 var gui = require('nw.gui');
 var win = gui.Window.get();
-win.setAlwaysOnTop(true);
-// alert(win);
+// win.setAlwaysOnTop(true);
 // win.focus();
-// gui.Window.focus();
+try {
+// win.focus();
+	window.focus();
+} catch(e) {
+	console.log(e);
+}
 
 $(function() {
 	$('.tool-close, .tool-close-blur').click(function() {
diff --git a/src/public/js/app/native.js b/src/public/js/app/native.js
index 3050f506..3ce82878 100644
--- a/src/public/js/app/native.js
+++ b/src/public/js/app/native.js
@@ -21,7 +21,7 @@ $(function() {
 	var isMacP = isMac();
 	$('.tool-close, .tool-close-blur').click(function() {
 		// mac下关闭才是隐藏
-		if(isMacP && location.href.indexOf('login.html') == -1 ) {
+		if(isMacP) {
 			win.hide();
 		} else {
 			win.close();
diff --git a/src/public/js/common.js b/src/public/js/common.js
index 6cce1a98..a2210f66 100644
--- a/src/public/js/common.js
+++ b/src/public/js/common.js
@@ -1384,7 +1384,7 @@ function switchAccount() {
 	SyncService.stop();
 	// location.href = 'login.html';
 	if(isMac()) {
-		gui.Window.open('login.html', {
+		var win2 = gui.Window.open('login.html', {
 			"icon": "public/images/logo/leanote_icon_blue.png",
 			frame: false, toolbar: false, resizable: false, 
 			transparent: true, 
@@ -1392,7 +1392,7 @@ function switchAccount() {
 			max_width: 278
 		});
 	} else {
-		gui.Window.open('login.html', {
+		var win2 = gui.Window.open('login.html', {
 			"icon": "public/images/logo/leanote_icon_blue.png",
 			frame: true, toolbar: false, resizable: false, 
 			transparent: false, 
@@ -1401,6 +1401,7 @@ function switchAccount() {
 			max_width: 278
 		});
 	}
+	// win2.focus();
 	// w.focus();
 	// gui.Window.close();
 	win.close();