diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index 0aa1ef1a..13f93708 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -82,7 +82,13 @@ switch (message.command) {
       if (!firstNode) {
         firstNode = node;
       }
-      lastNode = node;
+      if(node.textContent.trim() != '') {
+        lastNode = node;
+      }
+    }
+
+    if(!lastNode) {
+      lastNode = firstNode;
     }
 
     //if(message.do_autoselect && selection.isCollapsed && firstNode && lastNode) {