diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index 6e6d8cff..8fcd13af 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -909,6 +909,10 @@ div.awesomplete > ul {
     color: black;
 }
 
+form[name="linkform"].page-form {
+    overflow: visible;
+}
+
 @media screen and (max-width: 64em) {
     .page-form-complete .form-label {
         height: inherit;
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index 491f1da0..354499a4 100644
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -36,7 +36,7 @@ <h2 class="window-title">{'Shaare'|t}</h2>
       </div>
       <div>
         <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input autofocus"
-          data-list="{loop="$tags"}{$key}, {/loop}" data-multiple autocomplete="off" >
+          data-list="{loop="$tags"}{$key}, {/loop}" data-multiple data-autofirst autocomplete="off" >
       </div>
 
       <div>