diff --git a/src/EasyApp/Gui/Elements/TextField.qml b/src/EasyApp/Gui/Elements/TextField.qml
index bebbb9b..9f62cbf 100644
--- a/src/EasyApp/Gui/Elements/TextField.qml
+++ b/src/EasyApp/Gui/Elements/TextField.qml
@@ -80,6 +80,22 @@ T.TextField {
         Behavior on border.color { EaAnimations.ThemeChange {} }
     }
 
+    // Visual feedback for the user that editing finish was accepted
+    function _commit(event) {
+        if (!acceptableInput) {
+            warned = true
+            event.accepted = true
+            return
+        }
+        warned = false
+        accepted()
+        focus = false
+        event.accepted = true
+    }
+
+    Keys.onReturnPressed: (event) => _commit(event)
+    Keys.onEnterPressed:  (event) => _commit(event)
+
     //Mouse area to react on click events
     MouseArea {
         id: mouseArea
diff --git a/src/EasyApp/Gui/Elements/TextInput.qml b/src/EasyApp/Gui/Elements/TextInput.qml
index 0d8314e..64c54fa 100644
--- a/src/EasyApp/Gui/Elements/TextInput.qml
+++ b/src/EasyApp/Gui/Elements/TextInput.qml
@@ -66,6 +66,22 @@ T.TextField {
         color: 'transparent'
     }
 
+    // Visual feedback for the user that editing finish was accepted
+    function _commit(event) {
+        if (!acceptableInput) {
+            warned = true
+            event.accepted = true
+            return
+        }
+        warned = false
+        accepted()
+        focus = false
+        event.accepted = true
+    }
+
+    Keys.onReturnPressed: (event) => _commit(event)
+    Keys.onEnterPressed:  (event) => _commit(event)
+
     //Mouse area to react on click events
     MouseArea {
         id: mouseArea