diff --git a/changelog/unreleased/bugfix-enter-in-forms b/changelog/unreleased/bugfix-enter-in-forms
new file mode 100644
index 00000000000..2c36b09a0d6
--- /dev/null
+++ b/changelog/unreleased/bugfix-enter-in-forms
@@ -0,0 +1,7 @@
+Bugfix: Pressing enter in forms
+
+We fixed behavior when pressing enter in forms. For instance when adding or editing public links
+pressing enter in the name or password input fields, instead of saving the link it opened the datepicker.
+
+
+https://github.com/owncloud/owncloud-design-system/pull/2009
diff --git a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue
index d82aa0ab7a1..9cf237fb612 100644
--- a/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue
+++ b/packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue
@@ -136,6 +136,7 @@
             variation="primary"
             appearance="filled"
             @click="$_addLink"
+            submit="submit"
           >
             <translate>Create</translate>
           </oc-button>
@@ -147,6 +148,7 @@
             variation="primary"
             appearance="filled"
             @click="$_updateLink"
+            submit="submit"
           >
             <translate>Save</translate>
           </oc-button>
diff --git a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
index 0270b1cdcb6..535e7db6323 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
@@ -63,6 +63,7 @@
         appearance="filled"
         @click="share"
         v-text="$gettext('Share')"
+        submit="submit"
       />
     </div>
     <oc-hidden-announcer level="assertive" :announcement="announcement" />
diff --git a/packages/web-app-files/src/views/PublicLink.vue b/packages/web-app-files/src/views/PublicLink.vue
index 3b432c1b8dd..1131aa1a2ae 100644
--- a/packages/web-app-files/src/views/PublicLink.vue
+++ b/packages/web-app-files/src/views/PublicLink.vue
@@ -43,6 +43,7 @@
               appearance="filled"
               class="oc-login-authorize-button"
               :disabled="!password"
+              submit="submit"
             >
               <translate>Continue</translate>
             </oc-button>