diff --git a/apps/studio/scripts/template-parameters.ts b/apps/studio/scripts/template-parameters.ts
index 1aba2b808..8b3c28b15 100644
--- a/apps/studio/scripts/template-parameters.ts
+++ b/apps/studio/scripts/template-parameters.ts
@@ -58,7 +58,7 @@ function serializeParam(configParam: TemplateParameter): JSONSchema7 {
 }
 
 function serializeTemplateParameters(config: TemplateConfig): JSONSchema7 | undefined {
-  if (!config || !config.parameters) {
+  if (!config?.parameters) {
     return;
   }
 
diff --git a/apps/studio/src/components/Terminal/ProblemsTab.tsx b/apps/studio/src/components/Terminal/ProblemsTab.tsx
index b536ceb2e..f54d04015 100644
--- a/apps/studio/src/components/Terminal/ProblemsTab.tsx
+++ b/apps/studio/src/components/Terminal/ProblemsTab.tsx
@@ -280,6 +280,14 @@ export const ProblemsTabContent: FunctionComponent<ProblemsTabProps> = () => {
                         range.start.character + 1,
                       )
                     }
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter') {
+                        navigationSvc.scrollToEditorLine(
+                          range.start.line + 1,
+                          range.start.character + 1,
+                        );
+                      }
+                    }}
                   >
                     {range.start.line + 1}:{range.start.character + 1}
                   </td>