diff --git a/src/math-display.c b/src/math-display.c
index 57a102b..39cdba1 100644
--- a/src/math-display.c
+++ b/src/math-display.c
@@ -76,8 +76,9 @@ display_key_press_cb(GtkWidget *widget, GdkEventKey *event, MathDisplay *display
     state = event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK);
     c = gdk_keyval_to_unicode(event->keyval);
 
-    /* Solve on enter */
-    if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter) {
+    /* Solve on enter or equals key */
+    if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter || 
+	event->keyval == GDK_KEY_KP_Equal || event->keyval == GDK_KEY_equal) {
         math_equation_solve(display->priv->equation);
         return TRUE;
     }
