diff --git a/changelog/unreleased/remove-input-custom-events b/changelog/unreleased/remove-input-custom-events
new file mode 100644
index 000000000..079ce1e54
--- /dev/null
+++ b/changelog/unreleased/remove-input-custom-events
@@ -0,0 +1,7 @@
+Change: Removed change and keydown events from text input
+
+We've removed change and keydown custom events from text input component.
+All listeners are passed to the input element so all events are still accessible.
+Focus and input events are still implemented as custom events.
+
+https://github.com/owncloud/owncloud-design-system/pull/768
\ No newline at end of file
diff --git a/src/elements/OcModal.vue b/src/elements/OcModal.vue
index b413c38f5..045207a76 100644
--- a/src/elements/OcModal.vue
+++ b/src/elements/OcModal.vue
@@ -29,7 +29,7 @@
           :disabled="inputDisabled"
           :fix-message-line="true"
           @input="$_ocModal_input_onInput"
-          @change="$_ocModal_confirm"
+          @keydown.enter="$_ocModal_confirm"
         />
         <p
           v-else
diff --git a/src/elements/OcTextInput.vue b/src/elements/OcTextInput.vue
index 81e559a3e..406d1352f 100644
--- a/src/elements/OcTextInput.vue
+++ b/src/elements/OcTextInput.vue
@@ -14,7 +14,6 @@
       v-on="$_ocTextInput_listeners"
       @input="$_ocTextInput_onInput($event.target.value)"
       @focus="$_ocTextInput_onFocus($event.target)"
-      @keydown="$_ocTextInput_onKeyDown($event)"
       ref="input"
     />
     <div class="oc-text-input-message" v-if="$_ocTextInput_showMessageLine">
@@ -108,9 +107,11 @@ export default {
     },
     $_ocTextInput_listeners() {
       const listeners = this.$listeners
+
+      // Delete listeners for events which are emitted via methods
       delete(listeners["input"])
       delete(listeners["focus"])
-      delete(listeners["keydown"])
+
       return listeners
     }
   },
@@ -137,21 +138,6 @@ export default {
        **/
       this.$emit("focus", target.value)
     },
-    $_ocTextInput_onKeyDown(e) {
-      if (e.keyCode === 13) {
-        /**
-         * Change event - emitted as soon as the user hits enter
-         * @type {string}
-         */
-        this.$emit("change", e.target.value)
-      }
-
-      /**
-       * KeyDown event - emitted as soon as the user hits a key
-       * @type {event}
-       */
-      this.$emit("keydown", e)
-    },
   },
 }
 </script>