diff --git a/src/window.py b/src/window.py
index 0f3b892..e643517 100644
--- a/src/window.py
+++ b/src/window.py
@@ -1607,11 +1607,13 @@ Generate a title following these rules:
             self.available_models = json.load(f)
         if not os.path.exists(os.path.join(self.data_dir, "chats")):
             os.makedirs(os.path.join(self.data_dir, "chats"))
+        key_controller = Gtk.EventControllerKey.new()
+        key_controller.connect("key-pressed", lambda controller, keyval, keycode, state: self.send_message() if keyval==Gdk.KEY_Return else None)
+        self.message_text_view.add_controller(key_controller)
         self.set_help_overlay(self.shortcut_window)
         self.get_application().set_accels_for_action("win.show-help-overlay", ['<primary>slash'])
         self.get_application().create_action('new_chat', lambda *_: self.new_chat(), ['<primary>n'])
         self.get_application().create_action('clear', lambda *_: dialogs.clear_chat(self), ['<primary>e'])
-        self.get_application().create_action('send', lambda *_: self.send_message(self), ['Return'])
         self.get_application().create_action('import_chat', lambda *_: self.import_chat(), ['<primary>i'])
         self.get_application().create_action('create_model_from_existing', lambda *_: dialogs.create_model_from_existing(self))
         self.get_application().create_action('create_model_from_file', lambda *_: dialogs.create_model_from_file(self))