diff --git a/js/bootstrap-tokenfield.js b/js/bootstrap-tokenfield.js
index 9826b46..98902d2 100644
--- a/js/bootstrap-tokenfield.js
+++ b/js/bootstrap-tokenfield.js
@@ -803,6 +803,8 @@
                 .select()
                 .data( 'edit', true )
                 .width( tokenWidth )
+
+      this.update();
     }
 
   , unedit: function (focus) {
@@ -810,6 +812,7 @@
       $_input.appendTo( this.$wrapper )
       
       this.$input.data('edit', false)
+      this.$mirror.text('')
 
       this.update()