diff --git a/apps/portal/src/components/questions/CreateListDialog.tsx b/apps/portal/src/components/questions/CreateListDialog.tsx
index d363172c..fcd22395 100644
--- a/apps/portal/src/components/questions/CreateListDialog.tsx
+++ b/apps/portal/src/components/questions/CreateListDialog.tsx
@@ -22,18 +22,27 @@ export default function CreateListDialog({
     register: formRegister,
     handleSubmit,
     formState: { isSubmitting },
+    reset,
   } = useForm<CreateListFormData>();
   const register = useFormRegister(formRegister);
 
+  const handleDialogCancel = () => {
+    onCancel();
+    reset();
+  };
+
   return (
     <Dialog
       isShown={show}
       primaryButton={undefined}
       title="Create question list"
-      onClose={onCancel}>
+      onClose={handleDialogCancel}>
       <form
         className="mt-5 gap-2 sm:flex sm:items-center"
-        onSubmit={handleSubmit(onSubmit)}>
+        onSubmit={handleSubmit(async (data) => {
+          await onSubmit(data);
+          reset();
+        })}>
         <div className="w-full sm:max-w-xs">
           <TextInput
             id="listName"
@@ -49,9 +58,8 @@ export default function CreateListDialog({
           display="inline"
           label="Cancel"
           size="md"
-          type="submit"
           variant="tertiary"
-          onClick={onCancel}
+          onClick={handleDialogCancel}
         />
         <Button
           display="inline"
diff --git a/apps/portal/src/server/router/questions-list-router.ts b/apps/portal/src/server/router/questions-list-router.ts
index 6c53732b..5fbb82b0 100644
--- a/apps/portal/src/server/router/questions-list-router.ts
+++ b/apps/portal/src/server/router/questions-list-router.ts
@@ -10,6 +10,7 @@ export const questionListRouter = createProtectedRouter()
     async resolve({ ctx }) {
       const userId = ctx.session?.user?.id;
 
+      // TODO: Optimize by not returning question entries
       const questionsLists = await ctx.prisma.questionsList.findMany({
         include: {
           questionEntries: {