diff --git a/app/src/main/java/chat/revolt/activities/MainActivity.kt b/app/src/main/java/chat/revolt/activities/MainActivity.kt
index f00f5c27..feaadc40 100644
--- a/app/src/main/java/chat/revolt/activities/MainActivity.kt
+++ b/app/src/main/java/chat/revolt/activities/MainActivity.kt
@@ -6,6 +6,10 @@ import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Bundle
 import android.util.Log
+import android.view.KeyEvent
+import android.view.KeyboardShortcutGroup
+import android.view.KeyboardShortcutInfo
+import android.view.Menu
 import android.widget.Toast
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
@@ -327,6 +331,30 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onProvideKeyboardShortcuts(
+        data: MutableList<KeyboardShortcutGroup>?,
+        menu: Menu?,
+        deviceId: Int
+    ) {
+        val messaging = KeyboardShortcutGroup(
+            getString(R.string.keyboard_shortcut_messaging),
+            listOf(
+                KeyboardShortcutInfo(
+                    getString(R.string.keyboard_shortcut_messaging_new_line),
+                    KeyEvent.KEYCODE_ENTER,
+                    0
+                ),
+                KeyboardShortcutInfo(
+                    getString(R.string.keyboard_shortcut_messaging_send_message),
+                    KeyEvent.KEYCODE_ENTER,
+                    KeyEvent.META_CTRL_ON
+                )
+            )
+        )
+
+        data?.add(messaging)
+    }
+
     companion object {
         init {
             NativeLibraries.init()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f57ff49..14b3be1f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -711,4 +711,8 @@
     <string name="notification_channel_group_social">Friends and Social</string>
     <string name="notification_channel_friend_requests">Friend Requests</string>
     <string name="notification_channel_friend_requests_description">Incoming friend requests, as well as accepted requests you\'ve sent.</string>
+
+    <string name="keyboard_shortcut_messaging">Messaging</string>
+    <string name="keyboard_shortcut_messaging_new_line">New Line</string>
+    <string name="keyboard_shortcut_messaging_send_message">Send a Message</string>
 </resources>