diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index cbc3205a3..17748b482 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -45,7 +45,18 @@ class Admin::DomainVersionsController < AdminController
     per_page = 7
     @version = DomainVersion.find(params[:id])
     @q = DomainVersion.where(item_id: @version.item_id).order(created_at: :desc).search
-    @versions = @q.result.page(params[:page])
+
+    if (@q.result.count > per_page) && params[:page] == 'default'
+      page = 1
+      @q.result.each_with_index do |v, i|
+        break if v.id == @version.id and page = (i / per_page) + 1
+      end
+      params[:page] = page
+      @versions = @q.result.page(page)
+    else
+      @versions = @q.result.page(params[:page])
+    end
+
     @versions = @versions.per(per_page)
   end
 
diff --git a/app/views/admin/domain_versions/archive.haml b/app/views/admin/domain_versions/archive.haml
index 31fb9bc9d..de81af1e4 100644
--- a/app/views/admin/domain_versions/archive.haml
+++ b/app/views/admin/domain_versions/archive.haml
@@ -60,7 +60,7 @@
             - version.object_changes.to_h.each{|k,v| domain[k]=v.last}
 
               %tr
-                %td= link_to(domain.name, admin_domain_version_path(version.id))
+                %td= link_to(domain.name, admin_domain_version_path(version.id, :page => 'default'))
                 %td
                   - if domain.registrant
                     = domain.registrant
diff --git a/app/views/admin/domain_versions/show.haml b/app/views/admin/domain_versions/show.haml
index c384e4efb..f169174f5 100644
--- a/app/views/admin/domain_versions/show.haml
+++ b/app/views/admin/domain_versions/show.haml
@@ -76,17 +76,17 @@
               %br
           %dt= t(:registrar)
           %dd= domain.registrar.name
-      %span{:style => "padding-right:10px; float: right; bottom: 10px;"}
+      %div{:style => "margin: 20px 20px; clear:both;"}
         - if @version.previous
           = link_to(t(:previous),
-                    admin_domain_version_path(@version.previous.id),
+                    admin_domain_version_path(@version.previous.id, :page => 'default'),
                     class: 'btn btn-primary')
         - else
           %a.btn.btn-primary.disabled{:href => "#"}
             %span= t(:previous)
         - if @version.next
           = link_to(t(:next),
-                    admin_domain_version_path(@version.next.id),
+                    admin_domain_version_path(@version.next.id, :page => 'default'),
                     class: 'btn btn-default')
         - else
           %a.btn.btn-default.disabled{:href => "#"}
@@ -96,14 +96,14 @@
     .panel.panel-default{:style => "min-height:450px;"}
       %ul.nav.nav-pills.nav-stacked
         - @versions.each do |vs|
-          - if vs.id == @version.id and vs.reify
+          - if vs.id == @version.id
             %li.active
-              = link_to admin_domain_version_path(vs.id) do
+              = link_to admin_domain_version_path(vs.id, :page => 'default') do
                 = l(vs.created_at, format: :short)
                 = vs.event
           - else
             %li
-              = link_to admin_domain_version_path(vs.id) do
+              = link_to admin_domain_version_path(vs.id, :page => 'default') do
                 = l(vs.created_at, format: :short)
                 = vs.event
       %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}