diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index ec1d46a46..5a55e2be8 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -31,7 +31,6 @@ export default {
     name: "listButton",
     mixins: [inputButtonWrapperMixin],
     props: {
-        selectingInitiatesLoad: Boolean,
         loaderColor: String,
         loaderPosition: {
             type: String,
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 1564f3920..90e575ffd 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -57,12 +57,30 @@ export default {
 </script>
 
 <style lang="scss">
+@mixin list-card-focus($box-shadow-color) {
+    &:focus-visible + .list-card-content {
+        box-shadow: 0 0 0 2.5px $box-shadow-color;
+        border-radius: 0.5rem;
+    }
+    &:focus + .list-card-content {
+        box-shadow: 0 0 0 2.5px $box-shadow-color;
+        border-radius: 0.5rem;
+    }
+    &:checked:focus + .list-card-content {
+        box-shadow: 0 0 0 2.5px $box-shadow-color;
+    }
+}
 .list-card {
     border: 1px solid $gray-500;
 
     &.has-error {
         //Red border if invalid
         border: 1px solid $red;
+
+        input[type="checkbox"],
+        input[type="radio"] {
+            @include list-card-focus($red);
+        }
     }
 
     img {
@@ -108,17 +126,9 @@ export default {
             box-shadow: 0 0 0 1px $blue;
             border-radius: 0.5rem;
         }
-        &:focus-visible + .list-card-content {
-            box-shadow: 0 0 0 2.5px $blue;
-            border-radius: 0.5rem;
-        }
-        &:focus + .list-card-content {
-            box-shadow: 0 0 0 2.5px $blue;
-            border-radius: 0.5rem;
-        }
-        &:checked:focus + .list-card-content {
-            box-shadow: 0 0 0 2.5px $blue;
-        }
+
+        @include list-card-focus($blue);
+
         &:checked + .list-card-content {
             p {
                 color: $black;