diff --git a/src/widgets/card-widget.cpp b/src/widgets/card-widget.cpp
index 45826f9..028483b 100644
--- a/src/widgets/card-widget.cpp
+++ b/src/widgets/card-widget.cpp
@@ -505,7 +505,8 @@ CardWidget::CardWidget(const std::string& title, Gdk::RGBA cover_color,
         [this](guint keyval, guint keycode, Gdk::ModifierType state) {
             if (m_card_entry_revealer.get_child_revealed()) {
                 switch (keyval) {
-                    case GDK_KEY_Return: {
+                    case GDK_KEY_Return:
+                    case GDK_KEY_KP_Enter: {
                         this->on_confirm_changes();
                         this->off_rename();
                         break;
diff --git a/src/widgets/editable-label-header.cpp b/src/widgets/editable-label-header.cpp
index 9433351..f85f1d8 100644
--- a/src/widgets/editable-label-header.cpp
+++ b/src/widgets/editable-label-header.cpp
@@ -161,7 +161,8 @@ void EditableLabelHeader::on_key_released(guint keyval, guint keycode,
                                           Gdk::ModifierType state) {
     if (revealer.get_child_revealed()) {
         switch (keyval) {
-            case (GDK_KEY_Return): {
+            case (GDK_KEY_Return):
+            case (GDK_KEY_KP_Enter): {
                 on_confirm_changes();
                 break;
             }
diff --git a/src/widgets/task-widget.cpp b/src/widgets/task-widget.cpp
index 4415dfc..fe2f58a 100644
--- a/src/widgets/task-widget.cpp
+++ b/src/widgets/task-widget.cpp
@@ -102,7 +102,8 @@ TaskWidget::TaskWidget(CardDialog& card_details_dialog, const std::string& name,
         [this](guint keyval, guint keycode, Gdk::ModifierType state) {
             if (m_entry_revealer.get_child_revealed()) {
                 switch (keyval) {
-                    case (GDK_KEY_Return): {
+                    case (GDK_KEY_Return):
+                    case (GDK_KEY_KP_Enter): {
                         off_rename();
                         break;
                     }