diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
index dfb812de5..d5d20d3da 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
@@ -907,19 +907,20 @@ class ComposeActivity : BaseActivity(),
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         Log.d(TAG, event.toString())
-        if (event.isCtrlPressed) {
-            if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                // send toot by pressing CTRL + ENTER
-                this.onSendClicked()
+        if(event.action == KeyEvent.ACTION_DOWN) {
+            if (event.isCtrlPressed) {
+                if (keyCode == KeyEvent.KEYCODE_ENTER) {
+                    // send toot by pressing CTRL + ENTER
+                    this.onSendClicked()
+                    return true
+                }
+            }
+
+            if (keyCode == KeyEvent.KEYCODE_BACK) {
+                onBackPressed()
                 return true
             }
         }
-
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            onBackPressed()
-            return true
-        }
-
         return super.onKeyDown(keyCode, event)
     }