diff --git a/frontend/src/component/common/FormTemplate/FormTemplate.tsx b/frontend/src/component/common/FormTemplate/FormTemplate.tsx
index 4ab109d196..90e65bc826 100644
--- a/frontend/src/component/common/FormTemplate/FormTemplate.tsx
+++ b/frontend/src/component/common/FormTemplate/FormTemplate.tsx
@@ -41,12 +41,12 @@ const StyledContainer = styled('section', {
     shouldForwardProp: (prop) =>
         !['modal', 'compact'].includes(prop.toString()),
 })<{ modal?: boolean; compact?: boolean }>(({ theme, modal, compact }) => ({
-    minHeight: modal ? '100vh' : compact ? 0 : '80vh',
+    minHeight: modal ? '100vh' : compact ? 'unset' : '80vh',
     borderRadius: modal ? 0 : theme.spacing(2),
     width: '100%',
     display: 'flex',
     margin: '0 auto',
-    overflow: modal ? 'unset' : 'hidden',
+    overflow: modal || compact ? 'unset' : 'hidden',
     [theme.breakpoints.down(1100)]: {
         flexDirection: 'column',
         minHeight: 0,
diff --git a/frontend/src/component/project/Project/CreateProject/CreateProjectDialog/CreateProjectDialog.tsx b/frontend/src/component/project/Project/CreateProject/CreateProjectDialog/CreateProjectDialog.tsx
index 0c7b8b9dc8..bea4b15afe 100644
--- a/frontend/src/component/project/Project/CreateProject/CreateProjectDialog/CreateProjectDialog.tsx
+++ b/frontend/src/component/project/Project/CreateProject/CreateProjectDialog/CreateProjectDialog.tsx
@@ -118,6 +118,7 @@ export const CreateProjectDialogue = ({
     return (
         <StyledDialog open={open} onClose={onClose}>
             <FormTemplate
+                compact
                 disablePadding
                 description={documentation}
                 documentationLink='https://docs.getunleash.io/reference/projects'
diff --git a/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/DeleteProjectForm.tsx b/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/DeleteProjectForm.tsx
index ce66031309..38494399b4 100644
--- a/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/DeleteProjectForm.tsx
+++ b/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/DeleteProjectForm.tsx
@@ -3,6 +3,12 @@ import FormTemplate from 'component/common/FormTemplate/FormTemplate';
 import { useRequiredPathParam } from 'hooks/useRequiredPathParam';
 import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi';
 import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
+import { styled } from '@mui/material';
+
+const StyledContainer = styled('div')(({ theme }) => ({
+    borderRadius: theme.spacing(2),
+    overflow: 'hidden',
+}));
 
 interface IDeleteProjectForm {
     featureCount: number;
@@ -17,19 +23,21 @@ export const DeleteProjectForm = ({ featureCount }: IDeleteProjectForm) => {
     };
 
     return (
-        <FormTemplate
-            loading={loading}
-            title='Delete project'
-            description=''
-            documentationLink='https://docs.getunleash.io/reference/projects'
-            documentationLinkLabel='Projects documentation'
-            formatApiCode={formatProjectDeleteApiCode}
-            compact
-            compactPadding
-            showDescription={false}
-            showLink={false}
-        >
-            <DeleteProject projectId={id} featureCount={featureCount} />
-        </FormTemplate>
+        <StyledContainer>
+            <FormTemplate
+                loading={loading}
+                title='Delete project'
+                description=''
+                documentationLink='https://docs.getunleash.io/reference/projects'
+                documentationLinkLabel='Projects documentation'
+                formatApiCode={formatProjectDeleteApiCode}
+                compact
+                compactPadding
+                showDescription={false}
+                showLink={false}
+            >
+                <DeleteProject projectId={id} featureCount={featureCount} />
+            </FormTemplate>
+        </StyledContainer>
     );
 };
diff --git a/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateEnterpriseSettings.tsx b/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateEnterpriseSettings.tsx
index 215d0ab1ab..3a3dfb55ad 100644
--- a/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateEnterpriseSettings.tsx
+++ b/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateEnterpriseSettings.tsx
@@ -17,7 +17,6 @@ import useProjectOverview from 'hooks/api/getters/useProjectOverview/useProjectO
 const StyledContainer = styled('div')(({ theme }) => ({
     minHeight: 0,
     borderRadius: theme.spacing(2),
-    border: `1px solid ${theme.palette.divider}`,
     width: '100%',
     display: 'flex',
     margin: '0 auto',
@@ -151,6 +150,7 @@ export const UpdateEnterpriseSettings = ({
                 documentationLinkLabel='Projects documentation'
                 formatApiCode={formatProjectSettingsApiCode}
                 compactPadding
+                compact
                 showDescription={false}
                 showLink={false}
             >
diff --git a/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateProject.tsx b/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateProject.tsx
index 6f82fa80d2..b76f50dd13 100644
--- a/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateProject.tsx
+++ b/frontend/src/component/project/Project/ProjectSettings/Settings/EditProject/UpdateProject.tsx
@@ -19,21 +19,18 @@ import { useRequiredPathParam } from 'hooks/useRequiredPathParam';
 import { styled } from '@mui/material';
 import useProjectOverview from 'hooks/api/getters/useProjectOverview/useProjectOverview';
 
-const StyledContainer = styled('div')<{ isPro: boolean }>(
-    ({ theme, isPro }) => ({
+const StyledContainer = styled('div')(({ theme }) => ({
+    minHeight: 0,
+    borderRadius: theme.spacing(2),
+    width: '100%',
+    display: 'flex',
+    margin: '0 auto',
+    overflow: 'hidden',
+    [theme.breakpoints.down(1100)]: {
+        flexDirection: 'column',
         minHeight: 0,
-        borderRadius: theme.spacing(2),
-        border: isPro ? '0' : `1px solid ${theme.palette.divider}`,
-        width: '100%',
-        display: 'flex',
-        margin: '0 auto',
-        overflow: 'hidden',
-        [theme.breakpoints.down(1100)]: {
-            flexDirection: 'column',
-            minHeight: 0,
-        },
-    }),
-);
+    },
+}));
 
 const StyledFormContainer = styled('div')(({ theme }) => ({
     borderTop: `1px solid ${theme.palette.divider}`,
@@ -46,7 +43,7 @@ interface IUpdateProject {
 const EDIT_PROJECT_BTN = 'EDIT_PROJECT_BTN';
 export const UpdateProject = ({ project }: IUpdateProject) => {
     const id = useRequiredPathParam('projectId');
-    const { uiConfig, isPro } = useUiConfig();
+    const { uiConfig } = useUiConfig();
     const { setToastData, setToastApiError } = useToast();
     const { defaultStickiness } = useDefaultProjectSettings(id);
     const { trackEvent } = usePlausibleTracker();
@@ -110,7 +107,7 @@ export const UpdateProject = ({ project }: IUpdateProject) => {
     };
 
     return (
-        <StyledContainer isPro={isPro()}>
+        <StyledContainer>
             <FormTemplate
                 loading={loading}
                 title='General settings'