diff --git a/ui/src/Components/SilenceModal/SilenceForm.tsx b/ui/src/Components/SilenceModal/SilenceForm.tsx
index a361ab827..d482dd187 100644
--- a/ui/src/Components/SilenceModal/SilenceForm.tsx
+++ b/ui/src/Components/SilenceModal/SilenceForm.tsx
@@ -35,6 +35,32 @@ import { DateTimeSelect } from "./DateTimeSelect";
 import PayloadPreview from "./PayloadPreview";
 import { IconInput, AuthenticatedAuthorInput } from "./AuthorInput";
 
+const CommentInput: FC<{
+  silenceFormStore: SilenceFormStore;
+}> = observer(({ silenceFormStore }) => (
+  <IconInput
+    type="text"
+    autoComplete="on"
+    placeholder="Comment"
+    icon={faCommentDots}
+    value={silenceFormStore.data.comment}
+    onChange={(event) => silenceFormStore.data.setComment(event.target.value)}
+  />
+));
+
+const AuthorInput: FC<{
+  silenceFormStore: SilenceFormStore;
+}> = observer(({ silenceFormStore }) => (
+  <IconInput
+    type="text"
+    autoComplete="email"
+    placeholder="Author"
+    icon={faUser}
+    value={silenceFormStore.data.author}
+    onChange={(event) => silenceFormStore.data.setAuthor(event.target.value)}
+  />
+));
+
 const ShareButton: FC<{
   silenceFormStore: SilenceFormStore;
 }> = observer(({ silenceFormStore }) => {
@@ -170,14 +196,6 @@ const SilenceForm: FC<{
     silenceFormStore.data.addEmptyMatcher();
   };
 
-  const onAuthorChange = (author: string) => {
-    silenceFormStore.data.setAuthor(author);
-  };
-
-  const onCommentChange = (comment: string) => {
-    silenceFormStore.data.setComment(comment);
-  };
-
   const handleSubmit = action((event: SyntheticEvent<HTMLFormElement>) => {
     event.preventDefault();
 
@@ -230,24 +248,10 @@ const SilenceForm: FC<{
       {alertStore.info.authentication.enabled ? (
         <AuthenticatedAuthorInput alertStore={alertStore} />
       ) : (
-        <IconInput
-          type="text"
-          autoComplete="email"
-          placeholder="Author"
-          icon={faUser}
-          value={silenceFormStore.data.author}
-          onChange={(event) => onAuthorChange(event.target.value)}
-        />
+        <AuthorInput silenceFormStore={silenceFormStore} />
       )}
 
-      <IconInput
-        type="text"
-        autoComplete="on"
-        placeholder="Comment"
-        icon={faCommentDots}
-        value={silenceFormStore.data.comment}
-        onChange={(event) => onCommentChange(event.target.value)}
-      />
+      <CommentInput silenceFormStore={silenceFormStore} />
       <div className="d-flex flex-row justify-content-between">
         <span
           className="badge components-label cursor-pointer with-click text-muted my-auto"
diff --git a/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.tsx b/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.tsx
index 7ec8b556d..8972dcef4 100644
--- a/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.tsx
+++ b/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.tsx
@@ -1,4 +1,4 @@
-import { use, FC, useEffect } from "react";
+import { use, FC, useEffect, useMemo } from "react";
 
 import { action } from "mobx";
 
@@ -98,6 +98,11 @@ const LabelValueInput: FC<{
 
   const context = use(ThemeContext);
 
+  const ValueContainer = useMemo(
+    () => makeValueContainer(silenceFormStore, matcher),
+    [silenceFormStore, matcher],
+  );
+
   return (
     <Creatable
       styles={context.reactSelectStyles}
@@ -118,7 +123,7 @@ const LabelValueInput: FC<{
       hideSelectedOptions
       isMulti
       components={{
-        ValueContainer: makeValueContainer(silenceFormStore, matcher),
+        ValueContainer: ValueContainer,
         Placeholder: Placeholder,
         Menu: AnimatedMenuMultiple,
       }}