diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 4103c75cf..97a261779 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -200,13 +200,9 @@ export default {
 			this.valid = valid;
 			// NOTE(chris): On a list of radios/checkboxes only add the feedback message to the last item
 			if (this.name && (this.lcType == 'radio' || this.lcType == 'checkbox')) {
-				let n = this.$el.nextSibling;
-				for (; n; n = n.nextSibling)
-					if (n.nodeType == 1
-						&& n.__vueParentComponent?.ctx?.lcType == this.lcType
-						&& n.__vueParentComponent?.ctx?.name == this.name
-						)
-						return;
+				const selector = 'input[type="' + this.lcType + '"][name="' + this.name + '"]';
+				if ([...this.$el.parentNode.querySelectorAll(selector)].pop() != this.$refs.input)
+					return;
 			}
 			this.feedback = feedback;
 		},