diff --git a/src/apps/reports/src/pages/reports/ReportsPage.module.scss b/src/apps/reports/src/pages/reports/ReportsPage.module.scss
index e177b1b44..e282cf8d2 100644
--- a/src/apps/reports/src/pages/reports/ReportsPage.module.scss
+++ b/src/apps/reports/src/pages/reports/ReportsPage.module.scss
@@ -56,7 +56,7 @@
 
 .paramCard {
     display: grid;
-    grid-template-rows: auto 40px auto;
+    grid-template-rows: auto auto;
     row-gap: 8px;
     align-content: start;
 }
diff --git a/src/apps/reports/src/pages/reports/ReportsPage.tsx b/src/apps/reports/src/pages/reports/ReportsPage.tsx
index b27b76195..861372464 100644
--- a/src/apps/reports/src/pages/reports/ReportsPage.tsx
+++ b/src/apps/reports/src/pages/reports/ReportsPage.tsx
@@ -265,6 +265,15 @@ const formatParameterLabel = (name: string): string => (
         .replace(/^./, char => char.toUpperCase())
 )
 
+const buildParameterTooltipContent = (parameter: ReportParameter): JSX.Element => (
+    <>
+        <div>{parameter.description?.trim() || 'No description available.'}</div>
+        <div>
+            {`Location: ${parameter.location || 'query'} (${parameter.name})`}
+        </div>
+    </>
+)
+
 const EMPTY_BILLING_ACCOUNT_PROFILE_RESPONSE: BillingAccountProfileResponse = {
     billingAccount: undefined,
 }
@@ -369,14 +378,7 @@ const SelectedReportSection = (props: SelectedReportSectionProps): JSX.Element =
                                         <div className={styles.paramHeaderActions}>
                                             <div className={styles.paramTypePill}>{parameter.type}</div>
                                             <Tooltip
-                                                content={(
-                                                    <>
-                                                        {parameter.description || 'No description available'}
-                                                        <br />
-                                                        {`Location: ${parameter.location || 'query'} 
-                                                        (${parameter.name})`}
-                                                    </>
-                                                )}
+                                                content={buildParameterTooltipContent(parameter)}
                                                 place='top'
                                             >
                                                 <button
@@ -761,6 +763,7 @@ const ReportsPageContent: FC<ReportsPageContentProps> = props => {
         return (
             <InputText
                 {...commonProps}
+                forceUpdateValue
                 value={parameterValues[parameter.name] ?? ''}
                 onChange={handleParameterChange}
                 error={parameterErrors[parameter.name]}