diff --git a/lib/service/slack/index.js b/lib/service/slack/index.js
index 8fb2576..8a8d9e0 100644
--- a/lib/service/slack/index.js
+++ b/lib/service/slack/index.js
@@ -30,7 +30,10 @@ class SlackService extends Service {
   }
 
   loginWithToken(token, button) {
-    button.setTitle("Loading...")
+    if (button)
+      button.setTitle("Loading...")
+    else
+      this.loginWindow.setContentView(gui.Label.create('Loading...'))
     const rtm = new RTMClient(token)
     require('./private-apis').extend(rtm)
     rtm.once('unable_to_rtm_start', (error) => {
@@ -39,9 +42,12 @@ class SlackService extends Service {
     })
     rtm.once('authenticated', (data) => {
       new SlackAccount(this, data, rtm)
-      button.setVisible(false)
-      this.adujstLoginWindowSize()
-
+      if (button) {
+        this.loginWindow.getContentView().removeChildView(button)
+        this.adujstLoginWindowSize()
+      } else {
+        this.loginWindow.close()
+      }
     })
     rtm.start({batch_presence_aware: true})
   }