--- a/nuxeo-platform-tag-service/nuxeo-platform-tag-web/src/main/resources/nuxeo.war/incl/tagging.xhtml
+++ b/nuxeo-platform-tag-service/nuxeo-platform-tag-web/src/main/resources/nuxeo.war/incl/tagging.xhtml
@@ -45,7 +45,7 @@
                 <div>
                     <span id="tag_suggestDiv">
                         <h:inputText id="tagLabel" value="#{tagActions.tagLabel}"
-                            styleClass="dataInputText" onkeydown="if (event.keyCode == 13 || event.keyCode == 9) {return false;}">
+                            styleClass="dataInputText" onkeydown="if (event.keyCode == 13) {Element.next(Element.up(this)).click(); return false;} else if (event.keyCode == 9) {return false;} else return true;">
                         </h:inputText>
                     </span>
 
diff --git a/nuxeo-platform-tag-service/nuxeo-platform-tag-web/src/main/resources/nuxeo.war/widgets/summary/tagging_widget_template.xhtml b/nuxeo-platform-tag-service/nuxeo-platform-tag-web/src/main/resources/nuxeo.war/widgets/summary/tagging_widget_template.xhtml
--- a/nuxeo-platform-tag-service/nuxeo-platform-tag-web/src/main/resources/nuxeo.war/widgets/summary/tagging_widget_template.xhtml
+++ b/nuxeo-platform-tag-service/nuxeo-platform-tag-web/src/main/resources/nuxeo.war/widgets/summary/tagging_widget_template.xhtml
@@ -49,7 +49,7 @@
                 <div>
                     <span id="tag_suggestDiv">
                         <h:inputText id="tagLabel" value="#{tagActions.tagLabel}"
-                            styleClass="dataInputText" onkeydown="if (event.keyCode == 13 || event.keyCode == 9) {return false;}">
+                            styleClass="dataInputText" onkeydown="if (event.keyCode == 13) {Element.next(Element.up(this)).click(); return false;} else if (event.keyCode == 9) {return false;} else return true;">
                         </h:inputText>
                     </span>