diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index e38f406cbcdeb..ab1dd041bfc60 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -543,6 +543,16 @@
 		_onSelectRecipient: function(e, s) {
 			var self = this;
 
+			if (e.keyCode == 9) {
+				e.preventDefault();
+				e.target.value = s.item.label;
+				setTimeout(function() {
+					$(e.target).attr('disabled', false)
+						.autocomplete('search', $(e.target).val());
+				}, 0);
+				return false;
+			}
+
 			e.preventDefault();
 			// Ensure that the keydown handler for the input field is not
 			// called; otherwise it would try to add the recipient again, which