diff --git a/src/js/controller/write.js b/src/js/controller/write.js
index 845289a..4d9728c 100644
--- a/src/js/controller/write.js
+++ b/src/js/controller/write.js
@@ -483,7 +483,11 @@ define(function(require) {
         return {
             //scope: true,   // optionally create a child scope
             link: function(scope, element, attrs) {
-                element.on('click', function() {
+                element.on('click', function(e) {
+                    if(e.target.nodeName === 'INPUT') {
+                        return;
+                    }
+
                     var fieldName = attrs.field;
                     var field = scope[fieldName];
 
@@ -509,11 +513,6 @@ define(function(require) {
                 var field = scope[fieldName];
                 var index = parseInt(attrs.id.replace(fieldName, ''), 10);
 
-                element.on('click', function(e) {
-                    // focus on this one and dont bubble to field click handler
-                    e.stopPropagation();
-                });
-
                 element.on('blur', function() {
                     if (!checkForEmptyInput(field)) {
                         // create new field input
@@ -532,12 +531,14 @@ define(function(require) {
                         // catch space, comma, semicolon
                         e.preventDefault();
 
-                        // create new field input
-                        addInput(field, scope);
-                        // find next input and focus
-                        var nextId = fieldName + (index + 1);
-                        document.getElementById(nextId).focus();
-
+                        // add next field only if current input is not empty
+                        if(field[index].address) {
+                            // create new field input
+                            addInput(field, scope);
+                            // find next input and focus
+                            var nextId = fieldName + (index + 1);
+                            document.getElementById(nextId).focus();
+                        }
                     } else if ((code === 8 || code === 46) && !field[index].address && field.length > 1) {
                         // backspace, delete on empty input
                         // remove input
diff --git a/src/tpl/write.html b/src/tpl/write.html
index bbc5706..88d6d57 100644
--- a/src/tpl/write.html
+++ b/src/tpl/write.html
@@ -14,7 +14,7 @@
         <p field="to">
           <label>To:</label>
           <span ng-repeat="recipient in to track by $index">
-            <input id="to{{$index}}" value="{{recipient.address}}" ng-model="recipient.address" ng-trim="false" class="label" ng-class="{'label-blank': !recipient.address || recipient.secure === undefined, 'label-primary': recipient.secure === false}" auto-size="recipient.address" spellcheck="false" ng-change="onAddressUpdate(to, $index)" address-input="to" tabindex="1" ng-mouseover="getKeyId(recipient)" focus-me="state.lightbox === 'write' && writerTitle !== 'Reply'">
+            <input id="to{{$index}}" value="{{recipient.address}}" ng-model="recipient.address" ng-trim="false" class="label" ng-class="{'label-blank': !recipient.address || recipient.secure === undefined, 'label-primary': recipient.secure === false}" auto-size="recipient.address" spellcheck="false" ng-change="onAddressUpdate(to, $index)" address-input="to" tabindex="1" ng-mouseover="getKeyId(recipient)" focus-me="$index === 0 && state.lightbox === 'write' && writerTitle !== 'Reply'">
           </span>
         </p>
         <p field="cc" ng-show="showCC === true">