diff --git a/public/viewjs/batterytracking.js b/public/viewjs/batterytracking.js
index a0633ce1..f410fc74 100644
--- a/public/viewjs/batterytracking.js
+++ b/public/viewjs/batterytracking.js
@@ -140,19 +140,20 @@ $('#battery_id_text_input').on('blur', function(e)
 		{
 			possibleOptionElement = $("#battery_id option[value=\"" + gc[2] + "\"]").first();
 		}
-	}
 
-	if (possibleOptionElement.length > 0)
-	{
-		$('#battery_id').val(possibleOptionElement.val());
-		$('#battery_id').data('combobox').refresh();
-		$('#battery_id').trigger('change');
-	}
-	else
-	{
-		$('#battery_id').val(null);
-		$('#battery_id_text_input').val("");
-		$('#battery_id').data('combobox').refresh();
-		$('#battery_id').trigger('change');
+
+		if (possibleOptionElement.length > 0)
+		{
+			$('#battery_id').val(possibleOptionElement.val());
+			$('#battery_id').data('combobox').refresh();
+			$('#battery_id').trigger('change');
+		}
+		else
+		{
+			$('#battery_id').val(null);
+			$('#battery_id_text_input').val("");
+			$('#battery_id').data('combobox').refresh();
+			$('#battery_id').trigger('change');
+		}
 	}
 });
diff --git a/public/viewjs/choretracking.js b/public/viewjs/choretracking.js
index 64435ed8..6cc3d286 100644
--- a/public/viewjs/choretracking.js
+++ b/public/viewjs/choretracking.js
@@ -161,19 +161,19 @@ $('#chore_id_text_input').on('blur', function(e)
 		{
 			possibleOptionElement = $("#chore_id option[value=\"" + gc[2] + "\"]").first();
 		}
-	}
 
-	if (possibleOptionElement.length > 0)
-	{
-		$('#chore_id').val(possibleOptionElement.val());
-		$('#chore_id').data('combobox').refresh();
-		$('#chore_id').trigger('change');
-	}
-	else
-	{
-		$('#chore_id').val(null);
-		$('#chore_id_text_input').val("");
-		$('#chore_id').data('combobox').refresh();
-		$('#chore_id').trigger('change');
+		if (possibleOptionElement.length > 0)
+		{
+			$('#chore_id').val(possibleOptionElement.val());
+			$('#chore_id').data('combobox').refresh();
+			$('#chore_id').trigger('change');
+		}
+		else
+		{
+			$('#chore_id').val(null);
+			$('#chore_id_text_input').val("");
+			$('#chore_id').data('combobox').refresh();
+			$('#chore_id').trigger('change');
+		}
 	}
 });