         console.log "Saved keys."
 
     @getListView().on "RemoveItem", (item)=>
+      @newItem = no
       @removeItem item
       @getListView().emit "UpdatedItems"
+
+    @newItem = no
 
   loadItems: ()->
     @removeAllItems()

      iconOnly  : yes
      iconClass : "plus"
      callback  : =>
        @addItem {key: '', title: ''}, 0
        @getListView().items.first.swapSwappable()

  addCustomItem:(message)->
    @removeAllItems()

    @loadItems()

    @getListView().on "UpdatedItems", =>
      @newItem = no
      newKeys = @getItemsOrdered().map (item)-> item.getData()
      if newKeys.length is 0
        @addCustomItem "You have no SSH keys."
