diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index ccab7de1..853cef0f 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -387,12 +387,6 @@ class Shadowsocks
             changeSwitch(checked = false)
         case false =>
           serviceStop()
-          if (fab.isEnabled) {
-            fab.setEnabled(false)
-            handler.postDelayed(() => {
-              fab.setEnabled(true)
-            }, 1000)
-          }
       }
     })
     fab.setOnLongClickListener((v: View) => {
@@ -439,6 +433,8 @@ class Shadowsocks
     }
 
     updatePreferenceScreen()
+
+    serviceStop()
   }
 
   def addProfile(profile: Profile) {
@@ -493,7 +489,6 @@ class Shadowsocks
   }
 
   private def setPreferenceEnabled(enabled: Boolean) {
-    preferences.findPreference(Key.profiles).setEnabled(enabled)
     preferences.findPreference(Key.isNAT).setEnabled(enabled)
     for (name <- Shadowsocks.PROXY_PREFS) {
       val pref = preferences.findPreference(name)