diff --git a/pages_builder/assets/javascripts/onready.js b/pages_builder/assets/javascripts/onready.js
index 7a1fa552..789494c4 100644
--- a/pages_builder/assets/javascripts/onready.js
+++ b/pages_builder/assets/javascripts/onready.js
@@ -32,6 +32,12 @@
     GOVUK.GDM.validation();
   }
 
+  if (GOVUK.shimLinksWithButtonRole) {
+    GOVUK.shimLinksWithButtonRole.init({
+      selector: '.link-button'
+    });
+  }
+
   if (GOVUK.ShowHideContent) {
     var showHideContent = new GOVUK.ShowHideContent()
     showHideContent.init()
diff --git a/pages_builder/pages/link-button.yml b/pages_builder/pages/link-button.yml
index 1410265e..e540b048 100644
--- a/pages_builder/pages/link-button.yml
+++ b/pages_builder/pages/link-button.yml
@@ -2,6 +2,8 @@ pageTitle: Link buttons
 assetPath: ../govuk_template/assets/
 head: >
   <link rel="stylesheet" media="all" type="text/css" href="../public/stylesheets/index.css" />
+bodyEnd: >
+  <script type="text/javascript" src="../public/javascripts/govuk_frontend_toolkit/govuk/shim-links-with-button-role.js"></script>
 examples:
   -
     label: View service
diff --git a/toolkit/templates/link-button.html b/toolkit/templates/link-button.html
index af732ade..f8637a61 100644
--- a/toolkit/templates/link-button.html
+++ b/toolkit/templates/link-button.html
@@ -1 +1 @@
-<a class='link-button{% if advice %}-with-advice{% endif %}' href='{{ url }}'>{{ label }}</a>
+<a class='link-button{% if advice %}-with-advice{% endif %}' href='{{ url }}' role='button'>{{ label }}</a>