diff --git a/frontend/src/component/context/ContextForm/ContextForm.tsx b/frontend/src/component/context/ContextForm/ContextForm.tsx
index 6342e29ed948..a72f510d5e69 100644
--- a/frontend/src/component/context/ContextForm/ContextForm.tsx
+++ b/frontend/src/component/context/ContextForm/ContextForm.tsx
@@ -69,11 +69,11 @@ const StyledSwitchContainer = styled('div')({
     marginLeft: '-9px',
 });
 
-const StyledButtonContainer = styled('div')({
-    marginTop: 'auto',
+const StyledButtonContainer = styled('div')(({ theme }) => ({
+    marginTop: theme.spacing(3),
     display: 'flex',
     justifyContent: 'flex-end',
-});
+}));
 
 const StyledCancelButton = styled(Button)(({ theme }) => ({
     marginLeft: theme.spacing(3),