diff --git a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css
index 99ade19239..ff79659a96 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css
@@ -15,7 +15,7 @@ div#toolbar {
     margin: .3em 0;
 }
 
-ul.sortable_field, ul.sortable_subfield {
+.ui-tabs-panel ul {
     margin-bottom: 0;
     padding-left: 0;
 }
@@ -26,7 +26,16 @@ ul li.tag, ul li.tag li.subfield_line {
     padding-left: 30px;
 }
 
-ul li.tag::before,
+ul li.tag::before {
+    position: absolute;
+    font-size: .8em;
+    top: 0;
+    left: 10px;
+    content: " ";
+}
+
+
+ul li.tag.sortable_tag::before,
 ul li.tag li.subfield_line::before {
     color: #999;
     cursor: move;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 4eac7133bf..c23e5a9eda 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -680,9 +680,17 @@
                                         </ul>
                                     [% END %]
                                     [% previous = innerloo.tag %]
-                                    <ul class="sortable_field">
+                                    [% IF ( innerloo.repeatable ) %]
+                                        <ul class="sortable_field">
+                                    [% ELSE %]
+                                        <ul>
+                                    [% END %]
                                 [% END %]
-                                    <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
+                                    [% IF ( innerloo.repeatable ) %]
+                                        <li class="tag sortable_tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
+                                    [% ELSE %]
+                                        <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
+                                    [% END %]
                                         <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
                                             [% IF advancedMARCEditor %]
                                                 <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a>