diff --git a/browserid/static/dialog/css/m.css b/browserid/static/dialog/css/m.css
index 92c90159299bca4ff447ba614d1aa7ef97be655f..6688319e75c24c28df1069b9eb3b6a4676b9aed3 100644
--- a/browserid/static/dialog/css/m.css
+++ b/browserid/static/dialog/css/m.css
@@ -26,7 +26,7 @@
 
   section {
     position: static;
-    overflow: auto;
+    overflow: visible;
   }
 
   .inputs > li > label {
@@ -78,11 +78,6 @@
       background-color: transparent;
   }
 
-  #formWrap,
-  .vertical {
-      height: auto;
-  }
-
   .arrow {
       display: none;
   }
@@ -91,10 +86,6 @@
       height: 250px;
   }
 
-  #footer {
-      padding: 10px;
-  }
-
   #signIn .vertical {
     padding-bottom: 0;
   }
@@ -106,4 +97,9 @@
   #signIn .submit > p {
     font-size: 14px;
   }
+
+  #content, .pickemail .form_section, .pickemail .inputs, .vertical {
+    height: auto;
+    overflow: visible;
+  }
 }
diff --git a/browserid/static/dialog/css/popup.css b/browserid/static/dialog/css/popup.css
index 3e6e9cbe66a72979c040b0ce49285eb4cf58ab47..125750a3afa67bf70032b931d4c0deeee381b90f 100644
--- a/browserid/static/dialog/css/popup.css
+++ b/browserid/static/dialog/css/popup.css
@@ -94,21 +94,26 @@ h2 {
     width: 100%;
 }
 
+#content {
+    position: relative;
+    height: 250px;
+    overflow: hidden;
+}
+
 section {
-    display: table;
+    display: block;
     position: absolute;
-    top: 62px;
+    top: 0;
     left: 0;
-    height: 250px;
-    width: 100%;
-    overflow: hidden;
+    bottom: 0;
+    right: 0;
     z-index: 0;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
 section > .contents {
     display: table-cell;
     vertical-align: middle;
+    height: 250px;
 }
 
 #wait, #error {
@@ -444,13 +449,12 @@ header,
 footer {
     display: block;
     width: 100%;
+    border-top: 1px solid rgba(0, 0, 0, 0.05);
 }
 
 footer {
     padding: 20px;
     color: #aaa;   
-    position: fixed;
-    bottom: 0;
 }
 
 footer ul {
diff --git a/browserid/views/dialog.ejs b/browserid/views/dialog.ejs
index 97514ab043be209ed1a389da0569c1a4f7d45e4b..b2bb4b6e86afdf037348b096fef0991b0667a2b7 100644
--- a/browserid/views/dialog.ejs
+++ b/browserid/views/dialog.ejs
@@ -23,26 +23,27 @@
               </ul>
           </header>
 
-          <section id="formWrap">
-            <form novalidate class="cf"> 
+          <div id="content">
+              <section id="formWrap">
+                <form novalidate class="cf"> 
 
-            </form>
-          </section>
+                </form>
+              </section>
 
 
-          <section id="wait">
-              <div class="contents">
-                  <h2>Communicating with server</h2>
-                  <p>Just a moment while we talk with the server.</p>
-              </div>
-          </section>
+              <section id="wait">
+                  <div class="contents">
+                      <h2>Communicating with server</h2>
+                      <p>Just a moment while we talk with the server.</p>
+                  </div>
+              </section>
 
 
-          <section id="error">
-              <h2 class="title"></h2>
-              <p class="content"></p>
-          </section>
-
+              <section id="error">
+                  <h2 class="title"></h2>
+                  <p class="content"></p>
+              </section>
+          </div>
 
           <footer>
                 <ul class="cf">