diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index a971ad65..9890e7a4 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -55,7 +55,7 @@
 
     <activity
         android:name=".ShadowsocksRunnerActivity"
-        android:theme="@style/PopupTheme"
+        android:theme="@android:style/Theme.NoDisplay"
         android:launchMode="singleTask">
     </activity>
 
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksReceiver.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksReceiver.scala
index 1f5a5463..dd8df04b 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksReceiver.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksReceiver.scala
@@ -66,6 +66,7 @@ class ShadowsocksReceiver extends BroadcastReceiver {
     if (isAutoConnect && isInstalled) {
       val intent = new Intent(context, classOf[ShadowsocksRunnerActivity])
       intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
       context.startActivity(intent)
     }
   }
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
index 7a0d0b01..6d274593 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
@@ -67,6 +67,7 @@ class ShadowsocksRunnerActivity extends Activity {
         }
       } else {
         bgService.start(ConfigUtils.load(settings))
+        finish()
       }
     }
     override def onServiceDisconnected(name: ComponentName) {