diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74e40bca6..a24133fca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@
   [#897](https://github.com/nextcloud/cookbook/pull/897) @MarcelRobitaille
 - Fix UI glitch when keyword list is empty
   [#892](https://github.com/nextcloud/cookbook/pull/892) @MarcelRobitaille
+- Allow switching to new instruction line with Enter key
+  [#890](https://github.com/nextcloud/cookbook/pull/890) @MarcelRobitaille
 
 ### Documentation
 - Added clarification between categories and keywords for users
diff --git a/src/components/EditInputGroup.vue b/src/components/EditInputGroup.vue
index 624868b71..f26bd22cb 100644
--- a/src/components/EditInputGroup.vue
+++ b/src/components/EditInputGroup.vue
@@ -287,8 +287,11 @@ export default {
                     ) {
                         this.addNewEntry()
                     } else {
+                        // Focus the next input or textarea
+                        // We have to check for both, as inputs are used for
+                        // ingredients and textareas are used for instructions
                         $ul.children[$pressedLiIndex + 1]
-                            .getElementsByTagName("input")[0]
+                            .querySelector("input, textarea")
                             .focus()
                     }
                 } else if (this.referencePopupEnabled && e.key === "#") {