 
     initialize: (serializeState) ->
         @disposables = new CompositeDisposable()
-
-        atom.commands.add 'atom-workspace',
+        @commands = new CompositeDisposable()
+
+        @commands.add atom.commands.add 'atom-workspace',
             'jumpy:toggle': => @toggle()
             'jumpy:reset': => @reset()
             'jumpy:clear': => @clearJumpMode()

    # Tear down any state and detach
    destroy: ->
        console.log 'Jumpy: "destroy" called.'
        @clearJumpMode()

        for characterSet in [lowerCharacters, upperCharacters]
            for c in characterSet
                do (c) => commands['jumpy:' + c] = => @getKey(c)
        @commands.add atom.commands.add 'atom-workspace', commands

        # TODO: consider moving this into toggle for new bindings.
        @backedUpKeyBindings = _.clone atom.keymap.keyBindings
