diff --git a/lib/philomena_web/templates/search/index.html.slime b/lib/philomena_web/templates/search/index.html.slime
index 130d7dd4..91178d51 100644
--- a/lib/philomena_web/templates/search/index.html.slime
+++ b/lib/philomena_web/templates/search/index.html.slime
@@ -1,5 +1,5 @@
 = cond do
-  - Enum.any?(@images) or override_display(@tags) ->
+  - Enum.any?(@images) or override_display(@conn, @tags) ->
     = render PhilomenaWeb.ImageView, "index.html", conn: @conn, tags: @tags, images: @images, header: "Searching for #{@conn.params["q"]}", route: fn p -> ~p"/search?#{p}" end, scope: scope(@conn)
 
   - assigns[:error] ->
diff --git a/lib/philomena_web/views/search_view.ex b/lib/philomena_web/views/search_view.ex
index d03b689c..70f049bb 100644
--- a/lib/philomena_web/views/search_view.ex
+++ b/lib/philomena_web/views/search_view.ex
@@ -4,9 +4,10 @@ defmodule PhilomenaWeb.SearchView do
   def scope(conn), do: PhilomenaWeb.ImageScope.scope(conn)
   def hides_images?(conn), do: can?(conn, :hide, %Philomena.Images.Image{})
 
-  def override_display([{_tag, _description, dnp_entries}]) do
-    Enum.any?(dnp_entries)
+  def override_display(conn, [{tag, _description, dnp_entries}]) do
+    tag.images_count > 0 or Enum.any?(dnp_entries) or
+      (present?(tag.mod_notes) and can?(conn, :edit, tag))
   end
 
-  def override_display(_), do: false
+  def override_display(_conn, _tags), do: false
 end