diff --git a/www/register/main.js b/www/register/main.js
index f0b9a2e9c..97a1d1a20 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -118,6 +118,7 @@ define([
                 return void Cryptpad.alert(Messages.register_mustAcceptTerms);
             }
 
+            setTimeout(function () {
             Cryptpad.confirm("<h2 class='bright'>" + Messages.register_warning + "</h2>",
             function (yes) {
                 if (!yes) { return; }
@@ -200,6 +201,24 @@ define([
             }, true, function ($dialog) {
                 $dialog.find('> div').addClass('half');
             });
+            }, 150);
+        });
+
+        var clickRegister = Cryptpad.notAgainForAnother(function () {
+            $register.click();
+        }, 500);
+
+        $register.on('keypress', function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+
+            console.error(e.which);
+            switch (e.which) {
+                case 13: return clickRegister();
+                case 13: return clickRegister();
+                default:
+                    //console.log(e.which);
+            }
         });
 
         Test(function () {
diff --git a/www/slide/slide.less b/www/slide/slide.less
index dd0feb2ba..4482d85d3 100644
--- a/www/slide/slide.less
+++ b/www/slide/slide.less
@@ -239,6 +239,9 @@ div.modal, div#modal {
                 transition: margin-left 1s;
             }
         }
+        media-tag button {
+            max-height: none;
+        }
     }
 
     box-sizing: border-box;