diff --git a/assets/javascripts/discourse/components/assign-user-form.hbs b/assets/javascripts/discourse/components/assign-user-form.hbs
index 9b3bc37..661ba92 100644
--- a/assets/javascripts/discourse/components/assign-user-form.hbs
+++ b/assets/javascripts/discourse/components/assign-user-form.hbs
@@ -41,16 +41,4 @@
   </div>
 {{/if}}
 
-<div class="control-group assign-status">
-  <label>
-    {{i18n "discourse_assign.assign_modal.note_label"}}&nbsp;<span
-      class="label-optional"
-    >{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
-  </label>
-
-  <Textarea
-    id="assign-modal-note"
-    @value={{@model.note}}
-    {{on "keydown" this.handleTextAreaKeydown}}
-  />
-</div>
\ No newline at end of file
+<Assignment />
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/assignment.hbs b/assets/javascripts/discourse/components/assignment.hbs
new file mode 100644
index 0000000..e0a22eb
--- /dev/null
+++ b/assets/javascripts/discourse/components/assignment.hbs
@@ -0,0 +1,14 @@
+<div class="control-group assign-status">
+  <label>
+    {{i18n "discourse_assign.assign_modal.note_label"}}&nbsp;<span
+    class="label-optional"
+  >{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
+  </label>
+
+  <Textarea
+    id="assign-modal-note"
+    @value={{@model.note}}
+    {{on "keydown" this.handleTextAreaKeydown}}
+  />
+</div>
+
diff --git a/assets/javascripts/discourse/components/assignment.js b/assets/javascripts/discourse/components/assignment.js
new file mode 100644
index 0000000..a15e314
--- /dev/null
+++ b/assets/javascripts/discourse/components/assignment.js
@@ -0,0 +1,13 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default class AssignUserForm extends Component {
+  @action
+  handleTextAreaKeydown(event) {
+    if ((event.ctrlKey || event.metaKey) && event.key === "Enter") {
+      this.submit(); // fixme andrei
+    }
+  }
+}