diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index ede261b81b..f32cc40a96 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -174,7 +174,7 @@ module.exports = createReactClass({
             } else {
                 this._addAddressesToList([textInput]);
             }
-        } else if (e.key === Key.COMMA || e.key === Key.TAB) {
+        } else if (textInput && (e.key === Key.COMMA || e.key === Key.TAB)) {
             e.stopPropagation();
             e.preventDefault();
             this._addAddressesToList([textInput]);