diff --git a/public/viewjs/components/numberpicker.js b/public/viewjs/components/numberpicker.js
index 8db711d9..61f38f59 100644
--- a/public/viewjs/components/numberpicker.js
+++ b/public/viewjs/components/numberpicker.js
@@ -2,6 +2,7 @@ $(".numberpicker-down-button").unbind('click').on("click", function ()
 {
 	var inputElement = $(this).parent().parent().find('input[type="number"]')[0];
 	inputElement.stepDown();
+	$(inputElement).trigger('keyup');
 	$(inputElement).trigger('change');
 });
 
@@ -9,5 +10,6 @@ $(".numberpicker-up-button").unbind('click').on("click", function()
 {
 	var inputElement = $(this).parent().parent().find('input[type="number"]')[0];
 	inputElement.stepUp();
+	$(inputElement).trigger('keyup');
 	$(inputElement).trigger('change');
 });
diff --git a/views/components/numberpicker.blade.php b/views/components/numberpicker.blade.php
index d0ccb6bb..3aa4f354 100644
--- a/views/components/numberpicker.blade.php
+++ b/views/components/numberpicker.blade.php
@@ -11,6 +11,7 @@
 @php if(empty($additionalCssClasses)) { $additionalCssClasses = ''; } @endphp
 @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
 @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
+@php if(empty($additionalHtmlElements)) { $additionalHtmlElements = ''; } @endphp
 
 <div class="form-group {{ $additionalGroupCssClasses }}">
 	<label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span></label>
@@ -24,4 +25,5 @@
 		</div>
 		<div class="invalid-feedback">{{ $invalidFeedback }}</div>
 	</div>
+	{!! $additionalHtmlElements !!}
 </div>
diff --git a/views/habitform.blade.php b/views/habitform.blade.php
index 2865654a..274a6d21 100644
--- a/views/habitform.blade.php
+++ b/views/habitform.blade.php
@@ -49,11 +49,10 @@
 				'value' => $value,
 				'min' => '0',
 				'additionalCssClasses' => 'input-group-habit-period-type',
-				'invalidFeedback' => $L('This cannot be negative')
+				'invalidFeedback' => $L('This cannot be negative'),
+				'additionalHtmlElements' => '<p id="habit-period-type-info" class="form-text text-muted small d-none"></p>'
 			))
 
-			<p id="habit-period-type-info" class="form-text text-muted small d-none"></p>
-
 			<button id="save-habit-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
 
 		</form>
diff --git a/views/inventory.blade.php b/views/inventory.blade.php
index eb547b3a..cb9ee822 100644
--- a/views/inventory.blade.php
+++ b/views/inventory.blade.php
@@ -23,9 +23,9 @@
 				'min' => 0,
 				'value' => 1,
 				'invalidFeedback' => $L('The amount cannot be lower than #1', '1'),
-				'additionalAttributes' => ' data-notequal="notequal" not-equal="-1"'
+				'additionalAttributes' => 'data-notequal="notequal" not-equal="-1"',
+				'additionalHtmlElements' => '<div id="inventory-change-info" class="form-text text-muted small d-none"></div>'
 			))
-			<div id="inventory-change-info" class="form-text text-muted small d-none"></div>
 			
 			@include('components.datetimepicker', array(
 				'id' => 'best_before_date',
diff --git a/views/productform.blade.php b/views/productform.blade.php
index e6ba7c70..811acfe6 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -94,11 +94,10 @@
 				'min' => 1,
 				'value' => $value,
 				'invalidFeedback' => $L('The amount cannot be lower than #1', '1'),
-				'additionalCssClasses' => 'input-group-qu'
+				'additionalCssClasses' => 'input-group-qu',
+				'additionalHtmlElements' => '<p id="qu-conversion-info" class="form-text text-muted small d-none"></p>'
 			))
 
-			<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>
 		</form>
 	</div>