diff --git a/app/views/alchemy/admin/pictures/_archive.html.erb b/app/views/alchemy/admin/pictures/_archive.html.erb
index 215b26c957..2913870352 100644
--- a/app/views/alchemy/admin/pictures/_archive.html.erb
+++ b/app/views/alchemy/admin/pictures/_archive.html.erb
@@ -38,7 +38,6 @@
       style: 'float: none'
     ) %>
   </div>
-  <div id="pictures" class="picture-size--<%= @size %>">
   <% if @pictures.blank? and @recent_pictures.blank? and search_filter_params[:q].blank? %>
     <%= render_message do %>
       <%= Alchemy.t(:no_images_in_archive) %>
@@ -48,9 +47,10 @@
       <%= Alchemy.t(:no_search_results) %>
     <% end %>
   <% else %>
-    <%= render partial: 'picture', collection: @pictures %>
+    <div id="pictures" class="picture-size--<%= @size %>">
+      <%= render partial: 'picture', collection: @pictures %>
+    </div>
   <% end %>
-  </div>
 <% end %>
 
 <%= paginate @pictures, theme: 'alchemy' %>
diff --git a/app/views/alchemy/admin/pictures/_archive_overlay.html.erb b/app/views/alchemy/admin/pictures/_archive_overlay.html.erb
index 3f8b5810bc..af21dbeb3d 100644
--- a/app/views/alchemy/admin/pictures/_archive_overlay.html.erb
+++ b/app/views/alchemy/admin/pictures/_archive_overlay.html.erb
@@ -8,7 +8,20 @@
       <%= render 'tag_list' %>
     </div>
   </div>
-  <div id="overlay_picture_list" class="picture-size--<%= @size %>">
-    <%= render 'overlay_picture_list' %>
-  </div>
+  <% if @pictures.empty? %>
+    <%= render_message do %>
+      <% if search_filter_params.empty? %>
+        <%= Alchemy.t(:no_images_in_archive) %>
+      <% else %>
+        <%= Alchemy.t(:no_search_results) %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <div id="overlay_picture_list" class="picture-size--<%= @size %>">
+      <%= render partial: 'picture_to_assign',
+        collection: @pictures,
+        locals: {size: @size} %>
+      <%= paginate @pictures, theme: 'alchemy', remote: true, hide_per_page_select: true %>
+    </div>
+  <% end %>
 </div>
diff --git a/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb b/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb
deleted file mode 100644
index 9847e059a4..0000000000
--- a/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if @pictures.empty? %>
-  <%= render_message do %>
-    <%= Alchemy.t(:no_images_in_archive) %>
-  <% end %>
-<% else %>
-  <%= render partial: 'picture_to_assign',
-    collection: @pictures,
-    locals: {size: @size} %>
-  <%= paginate @pictures, theme: 'alchemy', remote: true, hide_per_page_select: true %>
-<% end %>