diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js
index bc9debb8..e9c5dce8 100644
--- a/public/viewjs/productform.js
+++ b/public/viewjs/productform.js
@@ -229,7 +229,7 @@ $('#product-form input').keydown(function(event)
 		}
 		else
 		{
-			$('#save-product-button').click();
+			$('.default-submit-button').click();
 		}
 	}
 });
@@ -538,3 +538,8 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 
 Grocy.FrontendHelpers.ValidateForm("product-form");
 Grocy.Components.ProductPicker.GetPicker().trigger("change");
+
+if (Grocy.EditMode == "edit")
+{
+	$(".save-product-button").toggleClass("default-submit-button");
+}
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 2860ff64..8e07638a 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -478,7 +478,7 @@
 				class="my-2 form-text text-muted @if($mode == 'edit') d-none @endif">{{ $__t('Save & continue to add quantity unit conversions & barcodes') }}</small>
 
 			<button id="save-product-button"
-				class="save-product-button btn btn-success mb-2"
+				class="save-product-button btn btn-success mb-2 default-submit-button"
 				data-location="continue">{{ $__t('Save & continue') }}</button>
 			<button class="save-product-button btn btn-info mb-2"
 				data-location="return">{{ $__t('Save & return to products') }}</button>