diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index cbf6cb89c6..b57c5610d2 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -907,7 +907,7 @@ composer_move_caret (EMsgComposer *composer)
 				"",
 				NULL);
 
-		if (is_message_from_edit_as_new) {
+		if (is_message_from_edit_as_new && !is_message_from_draft) {
 			element = WEBKIT_DOM_ELEMENT (body);
 			e_html_editor_selection_block_selection_changed (editor_selection);
 			goto move_caret;