diff --git a/public/viewjs/batteryform.js b/public/viewjs/batteryform.js
index cdcf6309..0a3aef7f 100644
--- a/public/viewjs/batteryform.js
+++ b/public/viewjs/batteryform.js
@@ -39,9 +39,10 @@ $('#battery-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('battery-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/batterytracking.js b/public/viewjs/batterytracking.js
index 1d7c3a8a..d859482e 100644
--- a/public/viewjs/batterytracking.js
+++ b/public/viewjs/batterytracking.js
@@ -68,9 +68,10 @@ $('#batterytracking-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('batterytracking-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/choreform.js b/public/viewjs/choreform.js
index 9021a884..885e6cfb 100644
--- a/public/viewjs/choreform.js
+++ b/public/viewjs/choreform.js
@@ -39,9 +39,10 @@ $('#chore-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+
 		if (document.getElementById('chore-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/choretracking.js b/public/viewjs/choretracking.js
index f3226c1f..7e6b50e3 100644
--- a/public/viewjs/choretracking.js
+++ b/public/viewjs/choretracking.js
@@ -65,9 +65,10 @@ $('#choretracking-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+
 		if (document.getElementById('choretracking-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/consume.js b/public/viewjs/consume.js
index 0af74d1d..861f5917 100644
--- a/public/viewjs/consume.js
+++ b/public/viewjs/consume.js
@@ -90,9 +90,10 @@ $('#consume-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('consume-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/inventory.js b/public/viewjs/inventory.js
index ee7652c4..a41a4841 100644
--- a/public/viewjs/inventory.js
+++ b/public/viewjs/inventory.js
@@ -118,9 +118,10 @@ $('#inventory-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('inventory-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/locationform.js b/public/viewjs/locationform.js
index a3fa6e78..fb82f0c4 100644
--- a/public/viewjs/locationform.js
+++ b/public/viewjs/locationform.js
@@ -39,9 +39,10 @@ $('#location-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('location-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js
index bfbfe320..d9a053d3 100644
--- a/public/viewjs/productform.js
+++ b/public/viewjs/productform.js
@@ -99,9 +99,10 @@ $('#product-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/productgroupform.js b/public/viewjs/productgroupform.js
index 32181d74..b4aba32b 100644
--- a/public/viewjs/productgroupform.js
+++ b/public/viewjs/productgroupform.js
@@ -39,9 +39,10 @@ $('#product-group-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('product-group-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js
index a62cb7f1..23fb089c 100644
--- a/public/viewjs/purchase.js
+++ b/public/viewjs/purchase.js
@@ -144,9 +144,10 @@ $('#purchase-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('purchase-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/quantityunitform.js b/public/viewjs/quantityunitform.js
index 853fb3fe..c1b89261 100644
--- a/public/viewjs/quantityunitform.js
+++ b/public/viewjs/quantityunitform.js
@@ -39,9 +39,10 @@ $('#quantityunit-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('quantityunit-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js
index 2f7806a3..0d42139f 100644
--- a/public/viewjs/recipeform.js
+++ b/public/viewjs/recipeform.js
@@ -58,9 +58,10 @@ $('#recipe-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('recipe-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/recipeposform.js b/public/viewjs/recipeposform.js
index b298b1fa..a3a6312b 100644
--- a/public/viewjs/recipeposform.js
+++ b/public/viewjs/recipeposform.js
@@ -88,9 +88,10 @@ $('#recipe-pos-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('recipe-pos-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/shoppinglistform.js b/public/viewjs/shoppinglistform.js
index 8294445c..0d7742b2 100644
--- a/public/viewjs/shoppinglistform.js
+++ b/public/viewjs/shoppinglistform.js
@@ -85,9 +85,10 @@ $('#shoppinglist-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('shoppinglist-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/taskcategoryform.js b/public/viewjs/taskcategoryform.js
index 00448648..4f070eef 100644
--- a/public/viewjs/taskcategoryform.js
+++ b/public/viewjs/taskcategoryform.js
@@ -39,9 +39,10 @@ $('#task-category-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('task-category-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/taskform.js b/public/viewjs/taskform.js
index a01da5a8..53f8de74 100644
--- a/public/viewjs/taskform.js
+++ b/public/viewjs/taskform.js
@@ -44,9 +44,10 @@ $('#task-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('task-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/public/viewjs/userform.js b/public/viewjs/userform.js
index b7b51917..5f851041 100644
--- a/public/viewjs/userform.js
+++ b/public/viewjs/userform.js
@@ -49,9 +49,10 @@ $('#user-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('user-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else
diff --git a/views/batteryform.blade.php b/views/batteryform.blade.php
index cd14a4e4..cccf6904 100644
--- a/views/batteryform.blade.php
+++ b/views/batteryform.blade.php
@@ -47,7 +47,7 @@
 				'invalidFeedback' => $L('This cannot be negative')
 			))
 
-			<button id="save-battery-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-battery-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/batterytracking.blade.php b/views/batterytracking.blade.php
index 280f08cf..9716223a 100644
--- a/views/batterytracking.blade.php
+++ b/views/batterytracking.blade.php
@@ -32,7 +32,7 @@
 				'invalidFeedback' => $L('This can only be before now')
 			))
 
-			<button id="save-batterytracking-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>
+			<button id="save-batterytracking-button" class="btn btn-success">{{ $L('OK') }}</button>
 
 		</form>
 	</div>
diff --git a/views/choreform.blade.php b/views/choreform.blade.php
index 5c7d5bed..0e8168f3 100644
--- a/views/choreform.blade.php
+++ b/views/choreform.blade.php
@@ -53,7 +53,7 @@
 				'additionalHtmlElements' => '<p id="chore-period-type-info" class="form-text text-muted small d-none"></p>'
 			))
 
-			<button id="save-chore-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-chore-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/choretracking.blade.php b/views/choretracking.blade.php
index 0911cf22..53cfc534 100644
--- a/views/choretracking.blade.php
+++ b/views/choretracking.blade.php
@@ -39,7 +39,7 @@
 				'prefillByUserId' => GROCY_USER_ID
 			))
 
-			<button id="save-choretracking-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>
+			<button id="save-choretracking-button" class="btn btn-success">{{ $L('OK') }}</button>
 
 		</form>
 	</div>
diff --git a/views/consume.blade.php b/views/consume.blade.php
index 48d343ff..32e3fa60 100644
--- a/views/consume.blade.php
+++ b/views/consume.blade.php
@@ -32,7 +32,7 @@
 				</label>
 			</div>
 
-			<button id="save-consume-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>
+			<button id="save-consume-button" class="btn btn-success">{{ $L('OK') }}</button>
 
 		</form>
 	</div>
diff --git a/views/inventory.blade.php b/views/inventory.blade.php
index cb9ee822..6f4d9bdc 100644
--- a/views/inventory.blade.php
+++ b/views/inventory.blade.php
@@ -42,7 +42,7 @@
 				'shortcutLabel' => 'Never expires'
 			))
 
-			<button id="save-inventory-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>
+			<button id="save-inventory-button" class="btn btn-success">{{ $L('OK') }}</button>
 
 		</form>
 	</div>
diff --git a/views/locationform.blade.php b/views/locationform.blade.php
index ce63b82d..6de7fafd 100644
--- a/views/locationform.blade.php
+++ b/views/locationform.blade.php
@@ -32,7 +32,7 @@
 				<textarea class="form-control" rows="2" id="description" name="description">@if($mode == 'edit'){{ $location->description }}@endif</textarea>
 			</div>
 
-			<button id="save-location-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-location-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/login.blade.php b/views/login.blade.php
index ade69f33..564b3414 100644
--- a/views/login.blade.php
+++ b/views/login.blade.php
@@ -29,7 +29,7 @@
 				</label>
 			</div>
 
-			<button id="login-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>
+			<button id="login-button" class="btn btn-success">{{ $L('OK') }}</button>
 
 		</form>
 	</div>
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 9aa34a38..fceec874 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -108,7 +108,7 @@
 				'additionalHtmlElements' => '<p id="qu-conversion-info" class="form-text text-muted small d-none"></p>'
 			))
 
-			<button id="save-product-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-product-button" class="btn btn-success">{{ $L('Save') }}</button>
 		</form>
 	</div>
 </div>
diff --git a/views/productgroupform.blade.php b/views/productgroupform.blade.php
index 4d31c001..919d31c0 100644
--- a/views/productgroupform.blade.php
+++ b/views/productgroupform.blade.php
@@ -32,7 +32,7 @@
 				<textarea class="form-control" rows="2" id="description" name="description">@if($mode == 'edit'){{ $group->description }}@endif</textarea>
 			</div>
 
-			<button id="save-product-group-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-product-group-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/purchase.blade.php b/views/purchase.blade.php
index 0df14a02..bbcc742b 100644
--- a/views/purchase.blade.php
+++ b/views/purchase.blade.php
@@ -49,7 +49,7 @@
 				'isRequired' => false
 			))
 
-			<button id="save-purchase-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>
+			<button id="save-purchase-button" class="btn btn-success">{{ $L('OK') }}</button>
 
 		</form>
 	</div>
diff --git a/views/quantityunitform.blade.php b/views/quantityunitform.blade.php
index 37740d86..74246f5e 100644
--- a/views/quantityunitform.blade.php
+++ b/views/quantityunitform.blade.php
@@ -37,7 +37,7 @@
 				<textarea class="form-control" rows="2" id="description" name="description">@if($mode == 'edit'){{ $quantityunit->description }}@endif</textarea>
 			</div>
 
-			<button id="save-quantityunit-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-quantityunit-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index 6f744d15..0dbdc3b7 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -36,7 +36,7 @@
 				<textarea id="description" class="form-control" name="description" rows="25">@if($mode == 'edit'){{ $recipe->description }}@endif</textarea>
 			</div>
 
-			<button id="save-recipe-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-recipe-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php
index b4b3b8d9..7b5e6e72 100644
--- a/views/recipeposform.blade.php
+++ b/views/recipeposform.blade.php
@@ -73,7 +73,7 @@
 				<textarea class="form-control" rows="2" id="note" name="note">@if($mode == 'edit'){{ $recipePos->note }}@endif</textarea>
 			</div>
 
-			<button id="save-recipe-pos-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-recipe-pos-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/shoppinglistform.blade.php b/views/shoppinglistform.blade.php
index c0bec572..494e138b 100644
--- a/views/shoppinglistform.blade.php
+++ b/views/shoppinglistform.blade.php
@@ -42,7 +42,7 @@
 				<textarea class="form-control" rows="2" id="note" name="note">@if($mode == 'edit'){{ $listItem->note }}@endif</textarea>
 			</div>
 
-			<button id="save-shoppinglist-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-shoppinglist-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/taskcategoryform.blade.php b/views/taskcategoryform.blade.php
index 8c3341f8..bce77b3f 100644
--- a/views/taskcategoryform.blade.php
+++ b/views/taskcategoryform.blade.php
@@ -32,7 +32,7 @@
 				<textarea class="form-control" rows="2" id="description" name="description">@if($mode == 'edit'){{ $category->description }}@endif</textarea>
 			</div>
 
-			<button id="save-task-category-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-task-category-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/taskform.blade.php b/views/taskform.blade.php
index fd507e66..db30f8c3 100644
--- a/views/taskform.blade.php
+++ b/views/taskform.blade.php
@@ -76,7 +76,7 @@
 				'prefillByUserId' => $initUserId
 			))
 
-			<button id="save-task-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-task-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>
diff --git a/views/userform.blade.php b/views/userform.blade.php
index 073ecdff..ecf2c31a 100644
--- a/views/userform.blade.php
+++ b/views/userform.blade.php
@@ -48,7 +48,7 @@
 				<div class="invalid-feedback">{{ $L('Passwords do not match') }}</div>
 			</div>
 
-			<button id="save-user-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
+			<button id="save-user-button" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
 	</div>