diff --git a/src/components/NextButton/NextButton.tsx b/src/components/NextButton/NextButton.tsx
index 4774eb9c23..6fc882649d 100644
--- a/src/components/NextButton/NextButton.tsx
+++ b/src/components/NextButton/NextButton.tsx
@@ -6,20 +6,20 @@ import styled from 'styled-components'
 
 import Button from 'components/Button'
 
+const StyledButton = styled(Button)<{ $appMode?: boolean }>`
+  ${({ $appMode }) => !$appMode && 'margin-right: 15px !important'};
+`
+
 interface Props {
   appMode?: boolean
   children: ReactNode
   onClick: (event: BaseSyntheticEvent) => void
 }
 
-const StyledButton = styled(Button)<Props>`
-  ${({ appMode }) => !appMode && 'margin-right: 15px !important'};
-  ${({ appMode }) => appMode && 'width: 100%;'}
-`
-
 const NextButton = ({ appMode, children, onClick, ...restProps }: Props) => (
   <StyledButton
     {...restProps}
+    $appMode={appMode}
     onClick={onClick}
     taskflow={!appMode}
     type="submit"