diff --git a/app/views/hyrax/base/_items.html.erb b/app/views/hyrax/base/_items.html.erb
index 5f5ee63c..9f38abc6 100644
--- a/app/views/hyrax/base/_items.html.erb
+++ b/app/views/hyrax/base/_items.html.erb
@@ -24,6 +24,6 @@
       </table>
     </div>
 </div>
-<% elsif can? :edit, @presenter.id %>
+<% elsif @presenter.current_ability.admin? && @presenter.tombstone.blank? %>
     <div class="alert alert-warning" role="alert"><%= t('.empty', type: @presenter.human_readable_type) %></div>
 <% end %>
diff --git a/app/views/hyrax/base/_no_edit_panel.html.erb b/app/views/hyrax/base/_no_edit_panel.html.erb
new file mode 100644
index 00000000..8e2542eb
--- /dev/null
+++ b/app/views/hyrax/base/_no_edit_panel.html.erb
@@ -0,0 +1,8 @@
+<div class="panel panel-default panel-edit">
+  <div class="panel-heading">
+    <h2>Edit Work</h2>
+  </div>
+  <div class="panel-body">
+    If you need to edit your work, contact the DataCORE team at: <a href="mailto:resdata@iu.edu">resdata@iu.edu</a>.
+  </div>
+</div>
diff --git a/app/views/hyrax/base/_show_actions.html.erb b/app/views/hyrax/base/_show_actions.html.erb
index 39a8768a..c98aa18d 100644
--- a/app/views/hyrax/base/_show_actions.html.erb
+++ b/app/views/hyrax/base/_show_actions.html.erb
@@ -5,9 +5,10 @@
       <%= render 'download_panel' %>
     <% end %>
 
-    <% if ((@presenter.editor? && @presenter.workflow.state != "deposited" ) ||
-         @presenter.current_ability.admin? ) %>
+    <% if @presenter.current_ability.admin?  %>
       <%= render 'edit_panel' %>
+    <% elsif @presenter.editor? %>
+      <%= render 'no_edit_panel' %>
     <% end %>
 
     <% if Hyrax.config.analytics? %>