diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index daeb65bd2125dfa9ca0aeade7e432af83faba9d1..25f79c63fd692607dd03c4027a237d6bdae6ff89 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -64,6 +64,11 @@ RedactorPlugins.draft = {
     setupDraftUpdate: function(data) {
         this.$box.parent().find('.draft-saved').show();
 
+        // Slight workaround. Signal the 'keyup' event normally signaled
+        // from typing in the <textarea>
+        if ($.autoLock && this.opts.draft_namespace == 'ticket.response')
+            $.autoLock.handleEvent();
+
         if (typeof data != 'object')
             data = $.parseJSON(data);
 
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index ee78effcf71fa2af68800af1725df051ca53bc58..619becddfc5f5029ebeeb3d64f2a489336432814 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -200,6 +200,7 @@ var autoLock = {
             type: 'POST',
             url: 'ajax.php/tickets/'+autoLock.tid+'/lock/'+autoLock.lockId+'/release',
             data: 'delete',
+            async: false,
             cache: false,
             success: function(){
 
@@ -257,7 +258,8 @@ var autoLock = {
         clearTimeout(autoLock.timerId);
         autoLock.timerId=setTimeout(function () { autoLock.monitorEvents() },30000);
     }
-}
+};
+$.autoLock = autoLock;
 
 /*
    UI & form events