diff --git a/Podfile.lock b/Podfile.lock
index 2e4d5ff..c6b5262 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -27,4 +27,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e59f622df37d0fe135432c1ccda243973c311def
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.2.0.beta.1
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
index 2e4d5ff..c6b5262 100644
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -27,4 +27,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e59f622df37d0fe135432c1ccda243973c311def
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.2.0.beta.1
diff --git a/Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG-frameworks.sh b/Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG-frameworks.sh
index 6afb24e..8e61e06 100755
--- a/Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG-frameworks.sh	
+++ b/Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG-frameworks.sh	
@@ -59,7 +59,7 @@ code_sign_if_enabled() {
   if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1""
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
diff --git a/Pods/Target Support Files/Pods-ShadowsocksX-NGTests/Pods-ShadowsocksX-NGTests-frameworks.sh b/Pods/Target Support Files/Pods-ShadowsocksX-NGTests/Pods-ShadowsocksX-NGTests-frameworks.sh
index 0f29f13..d839f60 100755
--- a/Pods/Target Support Files/Pods-ShadowsocksX-NGTests/Pods-ShadowsocksX-NGTests-frameworks.sh	
+++ b/Pods/Target Support Files/Pods-ShadowsocksX-NGTests/Pods-ShadowsocksX-NGTests-frameworks.sh	
@@ -59,7 +59,7 @@ code_sign_if_enabled() {
   if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1""
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
diff --git a/Pods/Target Support Files/Pods-proxy_conf_helper/Pods-proxy_conf_helper-frameworks.sh b/Pods/Target Support Files/Pods-proxy_conf_helper/Pods-proxy_conf_helper-frameworks.sh
index 0f29f13..d839f60 100755
--- a/Pods/Target Support Files/Pods-proxy_conf_helper/Pods-proxy_conf_helper-frameworks.sh	
+++ b/Pods/Target Support Files/Pods-proxy_conf_helper/Pods-proxy_conf_helper-frameworks.sh	
@@ -59,7 +59,7 @@ code_sign_if_enabled() {
   if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1""
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift
index da3cacc..841c235 100755
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@@ -562,8 +562,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         toastWindowCtrl = ToastWindowController(windowNibName: "ToastWindowController")
         toastWindowCtrl.message = message
         toastWindowCtrl.showWindow(self)
-        NSApp.activate(ignoringOtherApps: true)
-        toastWindowCtrl.window?.makeKeyAndOrderFront(self)
+        //NSApp.activate(ignoringOtherApps: true)
+        //toastWindowCtrl.window?.makeKeyAndOrderFront(self)
         toastWindowCtrl.fadeInHud()
     }
 }
diff --git a/ShadowsocksX-NG/ToastWindowController.swift b/ShadowsocksX-NG/ToastWindowController.swift
index f63aeb7..b688721 100644
--- a/ShadowsocksX-NG/ToastWindowController.swift
+++ b/ShadowsocksX-NG/ToastWindowController.swift
@@ -34,10 +34,11 @@ class ToastWindowController: NSWindowController {
         if let win = self.window {
             win.isOpaque = false
             win.backgroundColor = .clear
-            win.level = Int(CGWindowLevelForKey(.utilityWindow)) + 1000
             win.styleMask = .borderless
             win.hidesOnDeactivate = false
             win.collectionBehavior = .canJoinAllSpaces
+            win.level = Int(CGWindowLevelForKey(.floatingWindow))
+            win.orderFrontRegardless()
         }
 
         let viewLayer: CALayer = CALayer()
@@ -83,8 +84,6 @@ class ToastWindowController: NSWindowController {
 
         fadingOut = false
 
-        self.window?.orderFrontRegardless()
-
         CATransaction.begin()
         CATransaction.setAnimationDuration(kHudFadeInDuration)
         CATransaction.setCompletionBlock { self.didFadeIn() }
@@ -113,7 +112,7 @@ class ToastWindowController: NSWindowController {
 
     func didFadeOut() -> Void {
         if fadingOut {
-            self.window?.orderOut(nil)
+            self.window?.orderOut(self)
         }
         fadingOut = false
     }