diff --git a/src/lib/components/admin/Users/Groups/EditGroupModal.svelte b/src/lib/components/admin/Users/Groups/EditGroupModal.svelte
index 9c799d43f1..72e65c2d74 100644
--- a/src/lib/components/admin/Users/Groups/EditGroupModal.svelte
+++ b/src/lib/components/admin/Users/Groups/EditGroupModal.svelte
@@ -232,22 +232,42 @@
 							{/if}
 						</div>
 
-						<div
-							class="flex-1 mt-1 lg:mt-1 lg:h-[30rem] lg:max-h-[30rem] overflow-y-auto scrollbar-hidden"
-						>
-							{#if selectedTab == 'general'}
-								<Display
-									bind:name
-									bind:description
-									{edit}
-									onDelete={() => {
-										showDeleteConfirmDialog = true;
-									}}
-								/>
-							{:else if selectedTab == 'permissions'}
-								<Permissions bind:permissions {defaultPermissions} />
-							{:else if selectedTab == 'users'}
-								<Users bind:userCount groupId={group?.id} />
+						<div class="flex-1 mt-1 lg:mt-1 lg:h-[30rem] lg:max-h-[30rem] flex flex-col">
+							<div class="w-full h-full overflow-y-auto scrollbar-hidden">
+								{#if selectedTab == 'general'}
+									<Display
+										bind:name
+										bind:description
+										{edit}
+										onDelete={() => {
+											showDeleteConfirmDialog = true;
+										}}
+									/>
+								{:else if selectedTab == 'permissions'}
+									<Permissions bind:permissions {defaultPermissions} />
+								{:else if selectedTab == 'users'}
+									<Users bind:userCount groupId={group?.id} />
+								{/if}
+							</div>
+
+							{#if ['general', 'permissions'].includes(selectedTab)}
+								<div class="flex justify-end pt-3 text-sm font-medium gap-1.5">
+									<button
+										class="px-3.5 py-1.5 text-sm font-medium bg-black hover:bg-gray-900 text-white dark:bg-white dark:text-black dark:hover:bg-gray-100 transition rounded-full flex flex-row space-x-1 items-center {loading
+											? ' cursor-not-allowed'
+											: ''}"
+										type="submit"
+										disabled={loading}
+									>
+										{$i18n.t('Save')}
+
+										{#if loading}
+											<div class="ml-2 self-center">
+												<Spinner />
+											</div>
+										{/if}
+									</button>
+								</div>
 							{/if}
 						</div>
 					</div>
@@ -300,26 +320,6 @@
 							</button>
 						{/if}
 					</div> -->
-
-					{#if ['general', 'permissions'].includes(selectedTab)}
-						<div class="flex justify-end pt-3 text-sm font-medium gap-1.5">
-							<button
-								class="px-3.5 py-1.5 text-sm font-medium bg-black hover:bg-gray-900 text-white dark:bg-white dark:text-black dark:hover:bg-gray-100 transition rounded-full flex flex-row space-x-1 items-center {loading
-									? ' cursor-not-allowed'
-									: ''}"
-								type="submit"
-								disabled={loading}
-							>
-								{$i18n.t('Save')}
-
-								{#if loading}
-									<div class="ml-2 self-center">
-										<Spinner />
-									</div>
-								{/if}
-							</button>
-						</div>
-					{/if}
 				</form>
 			</div>
 		</div>