diff --git a/static/custom.js b/static/custom.js
index e81b39d..8f0d2d7 100644
--- a/static/custom.js
+++ b/static/custom.js
@@ -134,6 +134,15 @@ $(document).ready(function() {
         $('#burn-dropdown-btn').text("Burn: " + this.innerHTML);
     });
 
+    $('#password-modal').on('shown.bs.modal', function () {
+        $('#modal-password').trigger('focus');
+    })
+
+    $('#password-modal form').submit(function(event) {
+        event.preventDefault();
+        $('#decrypt-btn').click();
+    });
+
     $('#decrypt-btn').click(function(event) {
         var pass = $("#modal-password").val();
         var data = "";
diff --git a/static/index.html b/static/index.html
index faeb2cb..da3b4e6 100644
--- a/static/index.html
+++ b/static/index.html
@@ -254,7 +254,7 @@
 
             {{#if is_editable}}
             <div class="form-group">
-                <textarea class="form-control" id="content-textarea" rows="25">{{pastebin_code}}</textarea>
+                <textarea autofocus class="form-control" id="content-textarea" rows="25">{{pastebin_code}}</textarea>
             </div>
             {{/if}}
             {{#if is_created or is_clone}}