diff --git a/app/views/alchemy/admin/attachments/edit.html.erb b/app/views/alchemy/admin/attachments/edit.html.erb
index 5c449e8f93..ca25c9ceed 100644
--- a/app/views/alchemy/admin/attachments/edit.html.erb
+++ b/app/views/alchemy/admin/attachments/edit.html.erb
@@ -2,7 +2,7 @@
   url: {action: :update, q: params[:q], page: params[:page]}) do |f| -%>
   <%= f.input :name, input_html: {autofocus: true} %>
   <%= f.input :file_name, input_html: {autofocus: true}, hint: Alchemy.t(:attachment_filename_notice) %>
-  <div class="input string">
+  <div class="input string autocomplete_tag_list">
     <%= f.label :tag_list %>
     <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
   </div>
diff --git a/app/views/alchemy/admin/attachments/index.html.erb b/app/views/alchemy/admin/attachments/index.html.erb
index df3f2be447..0175959ea8 100644
--- a/app/views/alchemy/admin/attachments/index.html.erb
+++ b/app/views/alchemy/admin/attachments/index.html.erb
@@ -18,7 +18,7 @@
     <%= render 'filter_bar' %>
 
     <% if Alchemy::Attachment.tag_counts.any? %>
-      <div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
+      <div class="tag-list with_filter_bar<%= ' filtered' if params[:tagged_with].present? %>">
         <%= render 'tag_list' %>
       </div>
     <% end %>
diff --git a/app/views/alchemy/admin/pictures/_archive.html.erb b/app/views/alchemy/admin/pictures/_archive.html.erb
index 615215561b..4460b82580 100644
--- a/app/views/alchemy/admin/pictures/_archive.html.erb
+++ b/app/views/alchemy/admin/pictures/_archive.html.erb
@@ -1,9 +1,13 @@
 <div id="library_sidebar">
   <%= render 'filter_bar' %>
-  <div class="tag-list with_filter_bar<%= params[:tagged_with].present? ? ' filtered' : '' %>">
-    <%= render 'tag_list' %>
-  </div>
+
+  <% if Alchemy::Picture.tag_counts.any? %>
+    <div class="tag-list with_filter_bar<%= ' filtered' if params[:tagged_with].present? %>">
+      <%= render 'tag_list' %>
+    </div>
+  <% end %>
 </div>
+
 <%= form_tag delete_multiple_admin_pictures_path, method: :delete do %>
   <div class="selected_item_tools">
     <h2><%= Alchemy.t(:edit_selected_pictures) %></h2>
diff --git a/app/views/alchemy/admin/resources/_form.html.erb b/app/views/alchemy/admin/resources/_form.html.erb
index 080cfd8ccb..3d11bc7659 100644
--- a/app/views/alchemy/admin/resources/_form.html.erb
+++ b/app/views/alchemy/admin/resources/_form.html.erb
@@ -10,7 +10,7 @@
     <% end %>
   <% end %>
   <% if f.object.respond_to?(:tag_list) %>
-    <div class="input string">
+    <div class="input string autocomplete_tag_list">
       <%= f.label :tag_list %>
       <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
     </div>
diff --git a/app/views/alchemy/admin/resources/_tag_list.html.erb b/app/views/alchemy/admin/resources/_tag_list.html.erb
index 933b1ad49d..3a7d696c79 100644
--- a/app/views/alchemy/admin/resources/_tag_list.html.erb
+++ b/app/views/alchemy/admin/resources/_tag_list.html.erb
@@ -1,4 +1,4 @@
-<div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
+<div class="tag-list<%= ' with_filter_bar' if resource_has_filters %><%= ' filtered' if params[:tagged_with].present? %>">
   <h2><%= Alchemy.t("Filter by tag") %></h2>
   <%= js_filter_field '.tag-list li' %>
   <ul>