diff --git a/apps/web/components/Shell.tsx b/apps/web/components/Shell.tsx
index 442f2c44bb..2fd2e8d229 100644
--- a/apps/web/components/Shell.tsx
+++ b/apps/web/components/Shell.tsx
@@ -500,7 +500,7 @@ function UserDropdown({ small }: { small?: boolean }) {
       </DropdownMenuTrigger>
       <DropdownMenuContent portalled={true}>
         {helpOpen ? (
-          <HelpMenuItem />
+          <HelpMenuItem closeHelp={() => setHelpOpen(false)} />
         ) : (
           <>
             <DropdownMenuItem>
diff --git a/apps/web/ee/components/support/HelpMenuItem.tsx b/apps/web/ee/components/support/HelpMenuItem.tsx
index 33e80982c3..bfeec05657 100644
--- a/apps/web/ee/components/support/HelpMenuItem.tsx
+++ b/apps/web/ee/components/support/HelpMenuItem.tsx
@@ -10,13 +10,23 @@ import { trpc } from "@lib/trpc";
 
 import ContactMenuItem from "./ContactMenuItem";
 
-export default function HelpMenuItem() {
+interface HelpMenuItemProps {
+  closeHelp: () => void;
+}
+
+export default function HelpMenuItem({ closeHelp }: HelpMenuItemProps) {
   const [rating, setRating] = useState<null | string>(null);
   const [comment, setComment] = useState("");
   const [disableSubmit, setDisableSubmit] = useState(true);
   const { t } = useLocale();
 
-  const mutation = trpc.useMutation("viewer.submitFeedback");
+  const mutation = trpc.useMutation("viewer.submitFeedback", {
+    onSuccess: () => {
+      setDisableSubmit(true);
+      showToast("Thank you, feedback submitted", "success");
+      closeHelp();
+    },
+  });
 
   const onRatingClick = (value: string) => {
     setRating(value);
@@ -25,11 +35,6 @@ export default function HelpMenuItem() {
 
   const sendFeedback = async (rating: string, comment: string) => {
     mutation.mutate({ rating: rating, comment: comment });
-
-    if (mutation.isSuccess) {
-      setDisableSubmit(true);
-      showToast("Thank you, feedback submitted", "success");
-    }
   };
 
   return (