diff --git a/browserid/static/dialog/controllers/page_controller.js b/browserid/static/dialog/controllers/page_controller.js
index a1b6f0937e43b2ece83d8354ce1e8f6361e9b020..523a28921509c072da15dc033a21d69947aeaf9e 100644
--- a/browserid/static/dialog/controllers/page_controller.js
+++ b/browserid/static/dialog/controllers/page_controller.js
@@ -106,15 +106,15 @@
     },
 
     runErrorDialog: function(info) {
-      $(".dialog").hide();
+      $("#dialog").hide();
 
-      $("#error_dialog div.title").text(info.message);
-      $("#error_dialog div.content").text(info.description);
+      $("#error_dialog .title").text(info.message);
+      $("#error_dialog .content").text(info.description);
 
       $("#back").hide();
-      $("#cancel").hide();
-      $("#submit").show().unbind("click").click(function() {
-      }).text("Close");
+      $("input[type=submit]").hide();
+
+      $("#cancel").text("Close").addClass("action");
 
       $("#error_dialog").fadeIn(500);
     },
diff --git a/browserid/static/dialog/views/body.ejs b/browserid/static/dialog/views/body.ejs
index 813ccae9848365cb1880d191a491886cf9f616f9..c93e3a49c364cd09a7686826b9afd9561da122d2 100644
--- a/browserid/static/dialog/views/body.ejs
+++ b/browserid/static/dialog/views/body.ejs
@@ -10,6 +10,11 @@
   <div id="dialog" class="dialog">
   </div>
 
+  <div id="error_dialog">
+    <h3 class="title"></h3>
+    <p class="content"></p>
+  </div>
+
   <div id="bottom-bar">
   </div>
 </form>