From 17463c401faa42dba7cdc50586cde8e42ad96b3d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 09:58:04 +0000
Subject: [PATCH] post-merge fix

---
 src/components/views/dialogs/AddressPickerDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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]);