diff --git a/CHANGELOG b/CHANGELOG
index 5a256ec19..2524a82d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail
 ----------
 - Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489)
 - Fix messages count bar overlapping (#1485270)
+- Fix adding signature in drafts compose mode (#1485484)
 
 2008/10/09 (alec)
 ----------
diff --git a/program/js/app.js b/program/js/app.js
index 549de08e1..cd7f90a6f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -423,6 +423,7 @@ function rcube_webmail()
     var input_replyto = rcube_find_object('_replyto');
     var input_subject = rcube_find_object('_subject');
     var input_message = rcube_find_object('_message');
+    var draftid = rcube_find_object('_draft_saveid');
 
     // init live search events
     if (input_to)
@@ -433,7 +434,7 @@ function rcube_webmail()
       this.init_address_input_events(input_bcc);
 
     // add signature according to selected identity
-    if (input_from && input_from.type=='select-one')
+    if (input_from && input_from.type=='select-one' && (!draftid || draftid.value==''))
       this.change_identity(input_from);
 
     if (input_to && input_to.value=='')