diff --git a/.all-contributorsrc b/.all-contributorsrc
index 2d40ad6..80b8656 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -203,6 +203,16 @@
         "bug",
         "code"
       ]
+    },
+    {
+      "login": "Psyphant",
+      "name": "Christopher Tempel",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/364954?v=4",
+      "profile": "https://github.com/Psyphant",
+      "contributions": [
+        "bug",
+        "code"
+      ]
     }
   ],
   "repoType": "github"
diff --git a/README.md b/README.md
index 3b7615c..a00c86c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Enhanced textarea to achieve autocomplete functionality.
 
 [![MIT License][license-badge]][license]
 [![PRs Welcome][prs-badge]](#Development)
-[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors)
 [![npm](https://img.shields.io/npm/dw/@webscopeio/react-textarea-autocomplete.svg?style=flat-square)](https://www.npmjs.com/package/@webscopeio/react-textarea-autocomplete)
 
 <hr>
@@ -266,10 +266,7 @@ Also, I'd love to thank these wonderful people for their contribution ([emoji ke
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-| [<img src="https://avatars3.githubusercontent.com/u/8135252?v=4" width="100px;"/><br /><sub><b>Jakub Beneš</b></sub>](https://jukben.cz)<br />[💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=jukben "Code") [📖](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=jukben "Documentation") [🎨](#design-jukben "Design") [🤔](#ideas-jukben "Ideas, Planning, & Feedback") | [<img src="https://avatars3.githubusercontent.com/u/3114719?v=4" width="100px;"/><br /><sub><b>Andrey Taktaev</b></sub>](https://github.com/JokerNN)<br />[💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=JokerNN "Code") | [<img src="https://avatars0.githubusercontent.com/u/10706203?v=4" width="100px;"/><br /><sub><b>Marcin Lichwała</b></sub>](https://github.com/marcinlichwala)<br />[💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=marcinlichwala "Code") [📖](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=marcinlichwala "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/9276511?v=4" width="100px;"/><br /><sub><b>Davidson Nascimento</b></sub>](https://github.com/davidsonsns)<br />[💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=davidsonsns "Code") | [<img src="https://avatars1.githubusercontent.com/u/7477359?v=4" width="100px;"/><br /><sub><b>KajMagnus</b></sub>](http://www.effectivediscussions.org/)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Akajmagnus "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=kajmagnus "Code") | [<img src="https://avatars2.githubusercontent.com/u/1083817?v=4" width="100px;"/><br /><sub><b>Ján Vorčák</b></sub>](https://twitter.com/janvorcak)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Ajvorcak "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=jvorcak "Code") | [<img src="https://avatars2.githubusercontent.com/u/9800850?v=4" width="100px;"/><br /><sub><b>Mateusz Burzyński</b></sub>](https://github.com/Andarist)<br />[💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=Andarist "Code") [📦](#platform-Andarist "Packaging/porting to new platform") |
-| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars0.githubusercontent.com/u/35139777?v=4" width="100px;"/><br /><sub><b>Deepak Pai</b></sub>](https://github.com/debugpai2)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Adebugpai2 "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=debugpai2 "Code") | [<img src="https://avatars0.githubusercontent.com/u/2336595?v=4" width="100px;"/><br /><sub><b>Aleck Landgraf</b></sub>](http://aleck.me)<br />[💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=alecklandgraf "Code") | [<img src="https://avatars3.githubusercontent.com/u/8123356?v=4" width="100px;"/><br /><sub><b>Serguei Okladnikov</b></sub>](https://github.com/oklas)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Aoklas "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=oklas "Code") | [<img src="https://avatars1.githubusercontent.com/u/2987177?v=4" width="100px;"/><br /><sub><b>Michal Zochowski</b></sub>](https://github.com/michauzo)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Amichauzo "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=michauzo "Code") | [<img src="https://avatars2.githubusercontent.com/u/1263650?v=4" width="100px;"/><br /><sub><b>Igor Sachivka</b></sub>](https://github.com/isachivka)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Aisachivka "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=isachivka "Code") | [<img src="https://avatars3.githubusercontent.com/u/13059204?v=4" width="100px;"/><br /><sub><b>Andrew Shini</b></sub>](https://github.com/superandrew213)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Asuperandrew213 "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=superandrew213 "Code") | [<img src="https://avatars3.githubusercontent.com/u/3250906?v=4" width="100px;"/><br /><sub><b>Rikesh Ramlochund</b></sub>](https://paperboat.io)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Arrikesh "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=rrikesh "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/983876?v=4" width="100px;"/><br /><sub><b>Matthew Hamilton</b></sub>](https://github.com/diogeneshamilton)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Adiogeneshamilton "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12836237?v=4" width="100px;"/><br /><sub><b>Danila</b></sub>](https://github.com/O4epegb)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3AO4epegb "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=O4epegb "Code") | [<img src="https://avatars3.githubusercontent.com/u/600021?v=4" width="100px;"/><br /><sub><b>Silvio Di Stefano</b></sub>](http://sites.google.com/site/sdistefano/)<br />[💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=sdistefano "Code") | [<img src="https://avatars2.githubusercontent.com/u/1162278?v=4" width="100px;"/><br /><sub><b>Jelte Fennema</b></sub>](https://github.com/JelteF)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3AJelteF "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=JelteF "Code") | [<img src="https://avatars0.githubusercontent.com/u/857?v=4" width="100px;"/><br /><sub><b>Andy Pearson</b></sub>](http://andypearson.co)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Aandypearson "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=andypearson "Code") | [<img src="https://avatars0.githubusercontent.com/u/1889215?v=4" width="100px;"/><br /><sub><b>Martin Kinkelin</b></sub>](https://github.com/kinke)<br />[🐛](https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Akinke "Bug reports") [💻](https://github.com/webscopeio/react-textarea-autocomplete/commits?author=kinke "Code") |
+<table><tr><td align="center"><a href="https://jukben.cz"><img src="https://avatars3.githubusercontent.com/u/8135252?v=4" width="100px;" alt="Jakub Beneš"/><br /><sub><b>Jakub Beneš</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=jukben" title="Code">💻</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=jukben" title="Documentation">📖</a> <a href="#design-jukben" title="Design">🎨</a> <a href="#ideas-jukben" title="Ideas, Planning, & Feedback">🤔</a></td><td align="center"><a href="https://github.com/JokerNN"><img src="https://avatars3.githubusercontent.com/u/3114719?v=4" width="100px;" alt="Andrey Taktaev"/><br /><sub><b>Andrey Taktaev</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=JokerNN" title="Code">💻</a></td><td align="center"><a href="https://github.com/marcinlichwala"><img src="https://avatars0.githubusercontent.com/u/10706203?v=4" width="100px;" alt="Marcin Lichwała"/><br /><sub><b>Marcin Lichwała</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=marcinlichwala" title="Code">💻</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=marcinlichwala" title="Documentation">📖</a></td><td align="center"><a href="https://github.com/davidsonsns"><img src="https://avatars3.githubusercontent.com/u/9276511?v=4" width="100px;" alt="Davidson Nascimento"/><br /><sub><b>Davidson Nascimento</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=davidsonsns" title="Code">💻</a></td><td align="center"><a href="http://www.effectivediscussions.org/"><img src="https://avatars1.githubusercontent.com/u/7477359?v=4" width="100px;" alt="KajMagnus"/><br /><sub><b>KajMagnus</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Akajmagnus" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=kajmagnus" title="Code">💻</a></td><td align="center"><a href="https://twitter.com/janvorcak"><img src="https://avatars2.githubusercontent.com/u/1083817?v=4" width="100px;" alt="Ján Vorčák"/><br /><sub><b>Ján Vorčák</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Ajvorcak" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=jvorcak" title="Code">💻</a></td><td align="center"><a href="https://github.com/Andarist"><img src="https://avatars2.githubusercontent.com/u/9800850?v=4" width="100px;" alt="Mateusz Burzyński"/><br /><sub><b>Mateusz Burzyński</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=Andarist" title="Code">💻</a> <a href="#platform-Andarist" title="Packaging/porting to new platform">📦</a></td></tr><tr><td align="center"><a href="https://github.com/debugpai2"><img src="https://avatars0.githubusercontent.com/u/35139777?v=4" width="100px;" alt="Deepak Pai"/><br /><sub><b>Deepak Pai</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Adebugpai2" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=debugpai2" title="Code">💻</a></td><td align="center"><a href="http://aleck.me"><img src="https://avatars0.githubusercontent.com/u/2336595?v=4" width="100px;" alt="Aleck Landgraf"/><br /><sub><b>Aleck Landgraf</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=alecklandgraf" title="Code">💻</a></td><td align="center"><a href="https://github.com/oklas"><img src="https://avatars3.githubusercontent.com/u/8123356?v=4" width="100px;" alt="Serguei Okladnikov"/><br /><sub><b>Serguei Okladnikov</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Aoklas" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=oklas" title="Code">💻</a></td><td align="center"><a href="https://github.com/michauzo"><img src="https://avatars1.githubusercontent.com/u/2987177?v=4" width="100px;" alt="Michal Zochowski"/><br /><sub><b>Michal Zochowski</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Amichauzo" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=michauzo" title="Code">💻</a></td><td align="center"><a href="https://github.com/isachivka"><img src="https://avatars2.githubusercontent.com/u/1263650?v=4" width="100px;" alt="Igor Sachivka"/><br /><sub><b>Igor Sachivka</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Aisachivka" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=isachivka" title="Code">💻</a></td><td align="center"><a href="https://github.com/superandrew213"><img src="https://avatars3.githubusercontent.com/u/13059204?v=4" width="100px;" alt="Andrew Shini"/><br /><sub><b>Andrew Shini</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Asuperandrew213" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=superandrew213" title="Code">💻</a></td><td align="center"><a href="https://paperboat.io"><img src="https://avatars3.githubusercontent.com/u/3250906?v=4" width="100px;" alt="Rikesh Ramlochund"/><br /><sub><b>Rikesh Ramlochund</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Arrikesh" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=rrikesh" title="Code">💻</a></td></tr><tr><td align="center"><a href="https://github.com/diogeneshamilton"><img src="https://avatars1.githubusercontent.com/u/983876?v=4" width="100px;" alt="Matthew Hamilton"/><br /><sub><b>Matthew Hamilton</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Adiogeneshamilton" title="Bug reports">🐛</a></td><td align="center"><a href="https://github.com/O4epegb"><img src="https://avatars3.githubusercontent.com/u/12836237?v=4" width="100px;" alt="Danila"/><br /><sub><b>Danila</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3AO4epegb" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=O4epegb" title="Code">💻</a></td><td align="center"><a href="http://sites.google.com/site/sdistefano/"><img src="https://avatars3.githubusercontent.com/u/600021?v=4" width="100px;" alt="Silvio Di Stefano"/><br /><sub><b>Silvio Di Stefano</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=sdistefano" title="Code">💻</a></td><td align="center"><a href="https://github.com/JelteF"><img src="https://avatars2.githubusercontent.com/u/1162278?v=4" width="100px;" alt="Jelte Fennema"/><br /><sub><b>Jelte Fennema</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3AJelteF" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=JelteF" title="Code">💻</a></td><td align="center"><a href="http://andypearson.co"><img src="https://avatars0.githubusercontent.com/u/857?v=4" width="100px;" alt="Andy Pearson"/><br /><sub><b>Andy Pearson</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Aandypearson" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=andypearson" title="Code">💻</a></td><td align="center"><a href="https://github.com/kinke"><img src="https://avatars0.githubusercontent.com/u/1889215?v=4" width="100px;" alt="Martin Kinkelin"/><br /><sub><b>Martin Kinkelin</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3Akinke" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=kinke" title="Code">💻</a></td><td align="center"><a href="https://github.com/Psyphant"><img src="https://avatars0.githubusercontent.com/u/364954?v=4" width="100px;" alt="Christopher Tempel"/><br /><sub><b>Christopher Tempel</b></sub></a><br /><a href="https://github.com/webscopeio/react-textarea-autocomplete/issues?q=author%3APsyphant" title="Bug reports">🐛</a> <a href="https://github.com/webscopeio/react-textarea-autocomplete/commits?author=Psyphant" title="Code">💻</a></td></tr></table>
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
diff --git a/src/Textarea.jsx b/src/Textarea.jsx
index 511f787..9d38b07 100644
--- a/src/Textarea.jsx
+++ b/src/Textarea.jsx
@@ -761,8 +761,8 @@ class ReactTextareaAutocomplete extends React.Component<
     if (
       currentTrigger &&
       trigger[currentTrigger].afterWhitespace &&
-      (value[selectionEnd - lastToken.length - 1] !== " " &&
-        value[selectionEnd - lastToken.length - 1] !== undefined)
+      !/\s/.test(value[selectionEnd - lastToken.length - 1]) &&
+      value[selectionEnd - lastToken.length - 1] !== undefined
     ) {
       this._closeAutocomplete();
       return;