diff --git a/app/cmd/config.go b/app/cmd/config.go
index 040670b1936fb2b20bdc2d961a7a63d55b93c103..a4c9c1af9f19f2c45caf2a7c6020aad3c7324b2c 100644
--- a/app/cmd/config.go
+++ b/app/cmd/config.go
@@ -69,9 +69,9 @@ func setCurrentJenkins(name string) {
 	}
 }
 
-var config Config
+var config *Config
 
-func getConfig() Config {
+func getConfig() *Config {
 	return config
 }
 
diff --git a/app/cmd/config_remove.go b/app/cmd/config_remove.go
index e3f505616b94d302ba20a2966e97ee04b896fd9a..a51ee333fe75b23842419f595eb5003e1b0a0e8b 100644
--- a/app/cmd/config_remove.go
+++ b/app/cmd/config_remove.go
@@ -30,7 +30,8 @@ var configRemoveCmd = &cobra.Command{
 func removeJenkins(name string) (err error) {
 	current := getCurrentJenkins()
 	if name == current.Name {
-		err = fmt.Errorf("You cannot remove current Jenkins")
+		err = fmt.Errorf("You cannot remove current Jenkins, if you want to remove it, can select other items before")
+		return
 	}
 
 	index := -1
@@ -45,10 +46,7 @@ func removeJenkins(name string) (err error) {
 	if index == -1 {
 		err = fmt.Errorf("Cannot found by name %s", name)
 	} else {
-		config.JenkinsServers[index] = config.JenkinsServers[len(config.JenkinsServers)-1]
-		config.JenkinsServers[len(config.JenkinsServers)-1] = JenkinsServer{}
-		config.JenkinsServers = config.JenkinsServers[:len(config.JenkinsServers)-1]
-
+		config.JenkinsServers = append(config.JenkinsServers[:index], config.JenkinsServers[index+1:]...)
 		err = saveConfig()
 	}
 	return