diff --git a/core/client/views/editor-tag-widget.js b/core/client/views/editor-tag-widget.js
index 053e30bb5758..45daac0c1b5e 100644
--- a/core/client/views/editor-tag-widget.js
+++ b/core/client/views/editor-tag-widget.js
@@ -134,6 +134,12 @@
             var $target = $(e.currentTarget),
                 searchTerm = $.trim($target.val());
 
+            if (searchTerm) {
+                this.showSuggestions($target, searchTerm);
+            } else {
+                this.$suggestions.hide();
+            }
+
             if (e.keyCode === this.keys.UP) {
                 e.preventDefault();
                 if (this.$suggestions.is(":visible")) {
@@ -159,12 +165,6 @@
             if (e.keyCode === this.keys.UP || e.keyCode === this.keys.DOWN) {
                 return false;
             }
-
-            if (searchTerm) {
-                this.showSuggestions($target, searchTerm);
-            } else {
-                this.$suggestions.hide();
-            }
         },
 
         handleKeydown: function (e) {