diff --git a/app/services/smart_annotations/html_preview.rb b/app/services/smart_annotations/html_preview.rb
index 33b2a04fe..2ee459306 100644
--- a/app/services/smart_annotations/html_preview.rb
+++ b/app/services/smart_annotations/html_preview.rb
@@ -37,16 +37,12 @@ module SmartAnnotations
       def generate_rep_item_snippet(name, object)
         if object&.repository
           repository_name = fetch_repository_name(object)
-          if object.archived?
-            return "<span class='sa-type'>#{trim_repository_name(repository_name)}</span> " \
-                   "#{object.name} #{I18n.t('atwho.res.archived')}"
-          else
-            return "<a href='#{ROUTES.repository_repository_row_path(object.repository, object)}' " \
-                   "class='record-info-link'><span class='sa-type'>#{trim_repository_name(repository_name)}</span>#{object.name}</a>"
-          end
+          "<a href='#{ROUTES.repository_repository_row_path(object.repository, object)}' " \
+          "class='record-info-link'><span class='sa-type'>#{trim_repository_name(repository_name)}</span>" \
+          "#{object.name} #{object.archived? ? I18n.t('atwho.res.archived') : ''}</a>"
+        else
+          "<span class='sa-type'>Inv</span> #{name} #{I18n.t('atwho.res.deleted')}"
         end
-        "<span class='sa-type'>Inv</span> " \
-        "#{name} #{I18n.t('atwho.res.deleted')}"
       end
 
       def trim_repository_name(name)
diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb
index 2b3597148..a121aa76f 100644
--- a/app/views/repositories/_repository_row_info_modal.html.erb
+++ b/app/views/repositories/_repository_row_info_modal.html.erb
@@ -3,13 +3,17 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title"><%= t('repository_row.modal_info.head_title', repository_row: @repository_row.name) %></h4>
+        <h4 class="modal-title">
+          <%= t('repository_row.modal_info.head_title', repository_row: @repository_row.name) %>
+          <%= @repository_row.archived? ? I18n.t('atwho.res.archived') : '' %>
+        </h4>
       </div>
 
       <div class="modal-body">
         <ol class="breadcrumb breadcrumb-repository">
           <span class="fas fa-list-alt" aria-hidden="true"></span>
           <%= t('repositories.repository', name: @repository_row.repository.name) %>
+          <%= @repository_row.repository.archived? ? I18n.t('atwho.res.archived') : '' %>
         </ol>
         <p>
           <span>