diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index ffb6b50e2..d43719966 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -3,7 +3,7 @@ class Admin::DomainVersionsController < AdminController
 
   # rubocop:disable Style/GuardClause
   def index
-    @domain = Domain.find(params[:domain_id])
+    @domain = Domain.where(id: params[:domain_id]).includes({versions: :item}).first
     @versions = @domain.versions
 
     if @domain.pending_json.present?
@@ -13,13 +13,4 @@ class Admin::DomainVersionsController < AdminController
     end
   end
   # rubocop:enable Style/GuardClause
-
-  # def index
-    # # @q = DomainVersion.deleted.search(params[:q])
-    # # @domains = @q.result.page(params[:page])
-  # end
-
-  # def show
-    # @versions = DomainVersion.where(item_id: params[:id])
-  # end
 end
diff --git a/app/views/admin/domain_versions/_version.haml b/app/views/admin/domain_versions/_version.haml
index 3c8b87ff2..85adbf1c3 100644
--- a/app/views/admin/domain_versions/_version.haml
+++ b/app/views/admin/domain_versions/_version.haml
@@ -16,7 +16,7 @@
     - tech_contacts  = domain.tech_contacts
     - admin_contacts = domain.admin_contacts
     - registrant  = [domain.registrant]
-    - event       = 'PENDING'
+    - event       = ('PENDING<br>' + link_to(t(:manage), edit_admin_domain_path(params[:domain_id]))).html_safe
     - creator     = pending_user.try(:username)
   - else # if legacy data not presentable
     - nameservers    = []
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 41def004e..0f9e8eb11 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -903,4 +903,5 @@ en:
   poll_pending_update_rejected_by_registranti: 'Registrant rejected domain update'
   poll_pending_delete_rejected_by_registrant: 'Registrant rejected domain deletion'
   poll_pending_delete_confirmed_by_registrant: 'Registrant confirmed domain deletion'
+  manage: Manage