diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5471c71731..a2d8aba2b0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4697,6 +4697,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             switch (event.getKeyCode()) {
                 case KeyEvent.KEYCODE_ENTER:
+                case KeyEvent.KEYCODE_NUMPAD_ENTER:
                 case KeyEvent.KEYCODE_DPAD_CENTER:
                 case KeyEvent.KEYCODE_BUTTON_A:
                     boolean expanded = properties.getValue("expanded", message.id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index be35a3001e..8ccb55b64f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -7953,6 +7953,7 @@ public class FragmentCompose extends FragmentBase {
                 switch (event.getKeyCode()) {
                     case KeyEvent.KEYCODE_S:
                     case KeyEvent.KEYCODE_ENTER:
+                    case KeyEvent.KEYCODE_NUMPAD_ENTER:
                         onAction(R.id.action_check, "key");
                         return true;
                     case KeyEvent.KEYCODE_B:
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index e355d0d16c..8fe1dd6be4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -579,7 +579,9 @@ public class FragmentDialogSearch extends FragmentDialogBase {
         etQuery.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if (actionId == EditorInfo.IME_ACTION_GO ||
-                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                        (event != null &&
+                                (event.getKeyCode() == KeyEvent.KEYCODE_ENTER ||
+                                        event.getKeyCode() == KeyEvent.KEYCODE_NUMPAD_ENTER))) {
                     dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
                     return true;
                 }