diff --git a/CHANGELOG b/CHANGELOG
index 4f547ef40..747bff0a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix saving draft just after entering compose window (#1489012)
 - Fix javascript error in IE9 when loading form with placeholders into an iframe (#1489008)
 - Fix handling of some conditional comment tags in HTML message (#1489004)
 - Fix so forward as attachment works if additional attachment is added by message_compose hook (#1489000)
diff --git a/program/js/app.js b/program/js/app.js
index 32328358a..87cdf3b3d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -949,8 +949,8 @@ function rcube_webmail()
         // Reset the auto-save timer
         clearTimeout(this.save_timer);
 
-        // compose form did not change
-        if (this.cmp_hash == this.compose_field_hash()) {
+        // compose form did not change (and draft wasn't saved already)
+        if (this.draft_saved && this.cmp_hash == this.compose_field_hash()) {
           this.auto_save_start();
           break;
         }
@@ -3345,6 +3345,7 @@ function rcube_webmail()
 
   this.set_draft_id = function(id)
   {
+    this.draft_saved = id;
     $("input[name='_draft_saveid']").val(id);
   };