diff --git a/frontend/src/component/project/Project/CreateProject/NewProjectForm.tsx b/frontend/src/component/project/Project/CreateProject/NewProjectForm.tsx
index d685d53408..af2492f64f 100644
--- a/frontend/src/component/project/Project/CreateProject/NewProjectForm.tsx
+++ b/frontend/src/component/project/Project/CreateProject/NewProjectForm.tsx
@@ -72,6 +72,7 @@ const FormActions = styled(StyledFormSection)(({ theme }) => ({
     display: 'flex',
     gap: theme.spacing(5),
     justifyContent: 'flex-end',
+    flexFlow: 'row wrap',
 }));
 
 type FormProps = {
diff --git a/frontend/src/component/project/Project/CreateProject/SelectionButton.styles.tsx b/frontend/src/component/project/Project/CreateProject/SelectionButton.styles.tsx
index 382d16c6d2..53c0517645 100644
--- a/frontend/src/component/project/Project/CreateProject/SelectionButton.styles.tsx
+++ b/frontend/src/component/project/Project/CreateProject/SelectionButton.styles.tsx
@@ -69,3 +69,8 @@ export const StyledDropdownSearch = styled(TextField, {
 export const TableSearchInput = styled(StyledDropdownSearch)(({ theme }) => ({
     maxWidth: '30ch',
 }));
+
+export const ScrollContainer = styled('div')(({ theme }) => ({
+    width: '100%',
+    overflow: 'auto',
+}));
diff --git a/frontend/src/component/project/Project/CreateProject/SelectionButton.tsx b/frontend/src/component/project/Project/CreateProject/SelectionButton.tsx
index 002fcfe7c6..a25d17f7df 100644
--- a/frontend/src/component/project/Project/CreateProject/SelectionButton.tsx
+++ b/frontend/src/component/project/Project/CreateProject/SelectionButton.tsx
@@ -17,6 +17,7 @@ import {
     StyledDropdownSearch,
     TableSearchInput,
     HiddenDescription,
+    ScrollContainer,
 } from './SelectionButton.styles';
 import { ChangeRequestTable } from './ChangeRequestTable';
 
@@ -445,11 +446,13 @@ export const TableSelect: FC<TableSelectProps> = ({
                         }}
                         onKeyDown={toggleTopItem}
                     />
-                    <ChangeRequestTable
-                        environments={filteredEnvs}
-                        enableEnvironment={onEnable}
-                        disableEnvironment={onDisable}
-                    />
+                    <ScrollContainer>
+                        <ChangeRequestTable
+                            environments={filteredEnvs}
+                            enableEnvironment={onEnable}
+                            disableEnvironment={onDisable}
+                        />
+                    </ScrollContainer>
                 </StyledDropdown>
             </StyledPopover>
         </>