diff --git a/plugins/scaffolder/src/components/JobStage/JobStage.tsx b/plugins/scaffolder/src/components/JobStage/JobStage.tsx
index 398595a274..53ceffc87d 100644
--- a/plugins/scaffolder/src/components/JobStage/JobStage.tsx
+++ b/plugins/scaffolder/src/components/JobStage/JobStage.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable jsx-a11y/click-events-have-key-events */
-/* eslint-disable jsx-a11y/no-static-element-interactions */
 /*
  * Copyright 2020 Spotify AB
  *
@@ -20,10 +18,12 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
+  AccordionActions,
   Box,
   CircularProgress,
   LinearProgress,
   Typography,
+  Button,
 } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
@@ -153,19 +153,17 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => {
               onClose={toggleLogsFullScreen}
               log={log}
             />
-            <div
-              style={{ height: '20vh', width: '100%' }}
-              onClick={toggleLogsFullScreen}
-            >
-              <LazyLog
-                text={`${log.join('\n')}\nclick to view logs in full screen.`}
-                extraLines={1}
-                follow
-              />
+            <div style={{ height: '20vh', width: '100%' }}>
+              <LazyLog text={`${log.join('\n')}`} extraLines={1} follow />
             </div>
           </Suspense>
         )}
       </AccordionDetails>
+      <AccordionActions>
+        <Button color="primary" onClick={toggleLogsFullScreen}>
+          Open in fullcreen
+        </Button>
+      </AccordionActions>
     </Accordion>
   );
 };
diff --git a/plugins/scaffolder/src/components/JobStage/LogModal.tsx b/plugins/scaffolder/src/components/JobStage/LogModal.tsx
index 6c6c5b4ffd..8c2d757ade 100644
--- a/plugins/scaffolder/src/components/JobStage/LogModal.tsx
+++ b/plugins/scaffolder/src/components/JobStage/LogModal.tsx
@@ -46,7 +46,15 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
-export const LogModal: React.FC<Props> = ({ log, open = false, onClose }) => {
+export const LogModal = ({
+  log,
+  open = false,
+  onClose,
+}: {
+  log: string[];
+  open: boolean;
+  onClose: () => void;
+}) => {
   const classes = useStyles();
 
   return (