diff --git a/source/UI/js/Video/AnnotationFolder.js b/source/UI/js/Video/AnnotationFolder.js
index 05f542f8..7da22e4d 100644
--- a/source/UI/js/Video/AnnotationFolder.js
+++ b/source/UI/js/Video/AnnotationFolder.js
@@ -269,7 +269,6 @@ Ox.AnnotationFolder = function(options, self) {
             })
             .appendTo(self.$outer);         
     }
-
     self.$annotations = Ox.ArrayEditable(Ox.extend({
             clickLink: self.options.clickLink,
             editable: self.options.editable,
@@ -291,11 +290,11 @@ Ox.AnnotationFolder = function(options, self) {
             width: self.options.width,
             maxHeight: self.options.type == 'text' ? Infinity : void 0,
             type: self.options.type == 'text' ? 'textarea' : 'input'
-        }, self.options.type == 'entity' ? {
+        }, self.options.autocomplete ? {
             autocomplete: function(value, callback) {
                 self.options.autocomplete(self.options.id, value, callback);
             },
-            autocompleteReplace: true,
+            autocompleteReplace: self.options.type == 'entity',
             //autocompleteReplaceCorrect: true,
             autocompleteSelect: true,
             autocompleteSelectHighlight: true,
diff --git a/source/UI/js/Video/AnnotationPanel.js b/source/UI/js/Video/AnnotationPanel.js
index 5e65bb57..f7ff0116 100644
--- a/source/UI/js/Video/AnnotationPanel.js
+++ b/source/UI/js/Video/AnnotationPanel.js
@@ -330,7 +330,6 @@ Ox.AnnotationPanel = function(options, self) {
         })
         .appendTo(self.$menubar);
     }
-
     function renderFolder(layer) {
         var index = Ox.getIndexById(self.options.layers, layer.id),
             item = Ox.getObjectById(layer.items, self.options.selected),
@@ -350,9 +349,7 @@ Ox.AnnotationPanel = function(options, self) {
                     selected: selected,
                     sort: self.options.sort,
                     width: self.options.width - Ox.UI.SCROLLBAR_SIZE
-                }, layer, layer.type == 'entity' ? {
-                    autocomplete: self.options.autocomplete,
-                } : layer.type == 'event' ? {
+                }, layer, layer.type == 'event' ? {
                     showWidget: self.options.showCalendar,
                     widgetSize: self.options.calendarSize
                 } : layer.type == 'place' ? {