diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/history/history.html
index 375daa8d87f..5aca9186ebe 100644
--- a/public/app/features/dashboard/history/history.html
+++ b/public/app/features/dashboard/history/history.html
@@ -74,22 +74,21 @@
 
         <div class="gf-form-group" ng-show="ctrl.mode === 'list'">
           <div class="gf-form-button-row">
-            <a	type="button"
+            <button	type="button"
                 class="btn gf-form-button btn-secondary"
                 ng-if="ctrl.revisions.length > 1"
-                ng-class="{disabled: !ctrl.canCompare}"
+                ng-disabled="!ctrl.canCompare"
                 ng-click="ctrl.getDiff(ctrl.diff)"
 								bs-tooltip="ctrl.canCompare ? '' : 'Select 2 versions to start comparing'" data-placement="bottom">
               <i class="fa fa-code-fork" ></i>&nbsp;&nbsp;Compare versions
-            </a>
-            <a  type="button"
+            </button>
+            <button  type="button"
                 class="btn gf-form-button btn-inverse"
                 ng-if="ctrl.revisions.length >= ctrl.limit"
                 ng-click="ctrl.addToLog()"
-                ng-class="{disabled: ctrl.isLastPage()}"
                 ng-disabled="ctrl.isLastPage()">
               Show more versions
-            </a>
+            </button>
           </div>
         </div>
       </div>
diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss
index 88752e49064..4be896d8ec0 100644
--- a/public/sass/components/_buttons.scss
+++ b/public/sass/components/_buttons.scss
@@ -41,6 +41,7 @@
   }
 
   &.disabled,
+  &[disabled],
   &:disabled {
     cursor: $cursor-disabled;
     opacity: .65;