diff --git a/public/viewjs/batterytracking.js b/public/viewjs/batterytracking.js
index 93d46f3f..b53c8d1a 100644
--- a/public/viewjs/batterytracking.js
+++ b/public/viewjs/batterytracking.js
@@ -35,8 +35,11 @@
 
 $('#battery_id').on('change', function(e)
 {
-	var batteryId = $(e.target).val();
+	var input = $('#battery_id_text_input').val().toString();
+	$('#battery_id_text_input').val(input);
+	$('#battery_id').data('combobox').refresh();
 
+	var batteryId = $(e.target).val();
 	if (batteryId)
 	{
 		Grocy.Components.BatteryCard.Refresh(batteryId);
diff --git a/public/viewjs/habittracking.js b/public/viewjs/habittracking.js
index 0ff5031d..7807f421 100644
--- a/public/viewjs/habittracking.js
+++ b/public/viewjs/habittracking.js
@@ -34,8 +34,11 @@
 
 $('#habit_id').on('change', function(e)
 {
-	var habitId = $(e.target).val();
+	var input = $('#habit_id_text_input').val().toString();
+	$('#habit_id_text_input').val(input);
+	$('#habit_id').data('combobox').refresh();
 
+	var habitId = $(e.target).val();
 	if (habitId)
 	{
 		Grocy.Components.HabitCard.Refresh(habitId);