diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue
index c94f9c3a4..2ab837a2c 100644
--- a/src/client/components/autocomplete.vue
+++ b/src/client/components/autocomplete.vue
@@ -378,6 +378,9 @@ export default Vue.extend({
 			vm.$once('selected', user => {
 				this.complete('user', user);
 			});
+			vm.$once('closed', () => {
+				this.textarea.focus();
+			});
 		}
 	}
 });