diff --git a/src/space-pen-extensions.coffee b/src/space-pen-extensions.coffee
index 04e411114..a6b197231 100644
--- a/src/space-pen-extensions.coffee
+++ b/src/space-pen-extensions.coffee
@@ -39,10 +39,10 @@ jQuery.fn.setTooltip = (tooltipOptions, {command, commandElement}={}) ->
 
   tooltipOptions = {title: tooltipOptions} if _.isString(tooltipOptions)
 
-  bindings = if commandElement
-    atom.keymap.keyBindingsForCommandMatchingElement(command, commandElement)
-  else
-    atom.keymap.keyBindingsForCommand(command)
+  if commandElement
+    bindings = atom.keymap.keyBindingsForCommandMatchingElement(command, commandElement)
+  else if command
+    bindings = atom.keymap.keyBindingsForCommand(command)
 
   tooltipOptions.title = "#{tooltipOptions.title} #{getKeystroke(bindings)}"