diff --git a/apps/portal/src/components/questions/ContributeQuestionCard.tsx b/apps/portal/src/components/questions/ContributeQuestionCard.tsx
index 54df1080..81ba6167 100644
--- a/apps/portal/src/components/questions/ContributeQuestionCard.tsx
+++ b/apps/portal/src/components/questions/ContributeQuestionCard.tsx
@@ -20,7 +20,7 @@ export default function ContributeQuestionCard() {
   };
 
   return (
-    <>
+    <div>
       <div
         className="flex flex-col items-stretch justify-center gap-2 rounded-md border border-slate-300 bg-white p-4 hover:bg-gray-100"
         onClick={handleOpenContribute}>
@@ -67,6 +67,6 @@ export default function ContributeQuestionCard() {
         show={showDraftDialog}
         onCancel={handleDraftDialogCancel}
       />
-    </>
+    </div>
   );
 }
diff --git a/apps/portal/src/components/questions/ContributeQuestionDialog.tsx b/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
index 4b551016..6c3d024a 100644
--- a/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
+++ b/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
@@ -32,7 +32,6 @@ export default function ContributeQuestionDialog({
           className="relative z-10"
           onClose={() => {
             // Todo: save state
-            setShowDiscardDialog(false);
             onCancel();
           }}>
           <Transition.Child
@@ -70,6 +69,7 @@ export default function ContributeQuestionDialog({
                             onSubmit={(data) => {
                               // eslint-disable-next-line no-console
                               console.log(data);
+                              onCancel();
                             }}
                           />
                         </div>
diff --git a/apps/portal/src/pages/questions/index.tsx b/apps/portal/src/pages/questions/index.tsx
index 23ba9b32..e77618ed 100644
--- a/apps/portal/src/pages/questions/index.tsx
+++ b/apps/portal/src/pages/questions/index.tsx
@@ -200,8 +200,8 @@ export default function QuestionsHomePage() {
           </div>
         </aside>
         <section className="flex min-h-0 flex-1 flex-col items-center overflow-auto pt-4">
-          <div className="flex min-h-0 max-w-3xl flex-1 gap-x-4">
-            <div className="flex flex-1 flex-col items-stretch justify-start gap-4">
+          <div className="flex min-h-0 max-w-3xl flex-1">
+            <div className="flex flex-1 flex-col items-stretch justify-start gap-4 pb-4">
               <ContributeQuestionCard />
               <QuestionSearchBar
                 sortOptions={[