diff --git a/src/app/extensions/order-templates/shared/product-add-to-order-template/product-add-to-order-template.component.html b/src/app/extensions/order-templates/shared/product-add-to-order-template/product-add-to-order-template.component.html
index 5d6d50b924..38020e7682 100644
--- a/src/app/extensions/order-templates/shared/product-add-to-order-template/product-add-to-order-template.component.html
+++ b/src/app/extensions/order-templates/shared/product-add-to-order-template/product-add-to-order-template.component.html
@@ -1,6 +1,6 @@
 <!-- display addToOrderTemplate Icon/animated Icon or link-->
 <button
-  type="submit"
+  type="button"
   name="addProduct"
   class="btn"
   [ngClass]="class"
diff --git a/src/app/extensions/wishlists/shared/product-add-to-wishlist/product-add-to-wishlist.component.html b/src/app/extensions/wishlists/shared/product-add-to-wishlist/product-add-to-wishlist.component.html
index 5be95baefa..38aa703113 100644
--- a/src/app/extensions/wishlists/shared/product-add-to-wishlist/product-add-to-wishlist.component.html
+++ b/src/app/extensions/wishlists/shared/product-add-to-wishlist/product-add-to-wishlist.component.html
@@ -1,6 +1,6 @@
 <!-- display addToCart Icon/animated Icon or link-->
 <button
-  type="submit"
+  type="button"
   name="addProduct"
   class="btn btn-link add-to-wishlist"
   (click)="openModal(modal)"
diff --git a/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.html b/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.html
index 2e15d7e7a5..1a57dd3d46 100644
--- a/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.html
+++ b/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.html
@@ -12,12 +12,13 @@
   <div class="form-inline" [ngbCollapse]="isCollapsed">
     <input
       [formControl]="codeInput"
+      (keydown.enter)="submitPromotionCode()"
       class="form-control"
       type="text"
       [maxlength]="codeMaxLength"
       [placeholder]="'shopping_cart.promotional_code.label' | translate"
     />
-    <button type="submit" class="btn btn-secondary" [disabled]="!codeInput.valid" (click)="submitPromotionCode()">
+    <button type="button" class="btn btn-secondary" [disabled]="!codeInput.valid" (click)="submitPromotionCode()">
       {{ 'shopping_cart.promotion.apply.button.label' | translate }}
     </button>
   </div>
diff --git a/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.ts b/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.ts
index b6afa81395..28aa73abef 100644
--- a/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.ts
+++ b/src/app/shared/components/basket/basket-promotion-code/basket-promotion-code.component.ts
@@ -61,6 +61,8 @@ export class BasketPromotionCodeComponent implements OnInit, OnDestroy {
       this.lastEnteredPromoCode = this.codeInput.value;
     }
     this.checkoutFacade.addPromotionCodeToBasket(this.codeInput.value);
+    // prevent further form submit
+    return false;
   }
 
   ngOnDestroy() {