diff --git a/js/misc/progress.js b/js/misc/progress.js
index 6eaaa68d141c4895f41161410f76a4883a5a261e..31d40494618eee8567ce7785a4a711cc0efbc480 100644
--- a/js/misc/progress.js
+++ b/js/misc/progress.js
@@ -61,7 +61,7 @@
      * @param {string} string
      */
     displayError: function (string) {
-      var error = $('<div class="alert alert-block alert-error"><a class="close" data-dismiss="alert" href="#">&times;</a><h4>' + Drupal.t('Error message') + '</h4></div>').append(string);
+      var error = $('<div class="alert alert-block alert-error"><button class="close" data-dismiss="alert">&times;</button><h4>' + Drupal.t('Error message') + '</h4></div>').append(string);
       $(this.element).before(error).hide();
 
       if (this.errorCallback) {
diff --git a/templates/system/status-messages.html.twig b/templates/system/status-messages.html.twig
index 327bfb586a5419b1611f452f41abde32d8098042..0920b96f578e1d785bc58579edeb1dfdb9129cfb 100644
--- a/templates/system/status-messages.html.twig
+++ b/templates/system/status-messages.html.twig
@@ -50,7 +50,7 @@
   ]
 %}
 <div{{ attributes.addClass(classes) }} role="alert">
-  <a href="#" role="button" class="close" data-dismiss="alert" aria-label="{{ 'Close'|t }}"><span aria-hidden="true">&times;</span></a>
+  <button role="button" class="close" data-dismiss="alert" aria-label="{{ 'Close'|t }}"><span aria-hidden="true">&times;</span></button>
   {% if status_headings[type] %}
     <h4 class="sr-only">{{ status_headings[type] }}</h4>
   {% endif %}