diff --git a/build/tasks/generate-asar-task.coffee b/build/tasks/generate-asar-task.coffee
index a71d88dfe..3de5f73b6 100644
--- a/build/tasks/generate-asar-task.coffee
+++ b/build/tasks/generate-asar-task.coffee
@@ -14,6 +14,7 @@ module.exports = (grunt) ->
       'ctags-darwin'
       'ctags-linux'
       'ctags-win32.exe'
+      '**/node_modules/spellchecker/**'
     ]
     unpack = "{#{unpack.join(',')}}"
 
diff --git a/package.json b/package.json
index 5597b2dcf..b9178a1df 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "fuzzy-finder": "0.83.0",
     "git-diff": "0.55.0",
     "go-to-line": "0.30.0",
-    "grammar-selector": "0.46.0",
+    "grammar-selector": "0.47.0",
     "image-view": "0.54.0",
     "incompatible-packages": "0.24.0",
     "keybinding-resolver": "0.32.0",
diff --git a/src/tooltip-manager.coffee b/src/tooltip-manager.coffee
index afde69db9..ee2054b5a 100644
--- a/src/tooltip-manager.coffee
+++ b/src/tooltip-manager.coffee
@@ -87,8 +87,9 @@ class TooltipManager
 
     new Disposable ->
       tooltip = $target.data('bs.tooltip')
-      tooltip.leave(currentTarget: target)
-      tooltip.hide()
+      if tooltip?
+        tooltip.leave(currentTarget: target)
+        tooltip.hide()
       $target.tooltip('destroy')
 
 humanizeKeystrokes = (keystroke) ->