diff --git a/src/lib/components/channel/ChannelInfoModal.svelte b/src/lib/components/channel/ChannelInfoModal.svelte
index c6c703fa48..9ebcbde39b 100644
--- a/src/lib/components/channel/ChannelInfoModal.svelte
+++ b/src/lib/components/channel/ChannelInfoModal.svelte
@@ -97,8 +97,8 @@
 		onUpdate={updateMembers}
 	/>
 	<Modal size="sm" bind:show>
-		<div>
-			<div class=" flex justify-between dark:text-gray-100 px-4 pt-3 mb-1">
+		<div class="flex max-h-[calc(100dvh-3rem)] flex-col">
+			<div class="flex shrink-0 justify-between dark:text-gray-100 px-4 pt-3 mb-1">
 				<div class="self-center text-base">
 					<div class="flex items-center gap-0.5 shrink-0">
 						{#if channel?.type === 'dm'}
@@ -130,16 +130,18 @@
 				</button>
 			</div>
 
-			<div class="flex flex-col md:flex-row w-full px-3 pb-4 md:space-x-4 dark:text-gray-200">
-				<div class=" flex flex-col w-full sm:flex-row sm:justify-center sm:space-x-6">
+			<div
+				class="flex min-h-0 flex-col md:flex-row w-full px-3 pb-4 md:space-x-4 dark:text-gray-200"
+			>
+				<div class="flex min-h-0 flex-col w-full sm:flex-row sm:justify-center sm:space-x-6">
 					<form
-						class="flex flex-col w-full"
+						class="flex min-h-0 flex-col w-full"
 						on:submit={(e) => {
 							e.preventDefault();
 							submitHandler();
 						}}
 					>
-						<div class="flex flex-col w-full h-full pb-2">
+						<div class="flex min-h-0 flex-col w-full pb-2">
 							<UserList
 								{channel}
 								apps={joinedApps}
diff --git a/src/lib/components/channel/ChannelInfoModal/UserList.svelte b/src/lib/components/channel/ChannelInfoModal/UserList.svelte
index 7919bd9a5d..9baaf524eb 100644
--- a/src/lib/components/channel/ChannelInfoModal/UserList.svelte
+++ b/src/lib/components/channel/ChannelInfoModal/UserList.svelte
@@ -106,13 +106,13 @@
 	}
 </script>
 
-<div class="flex flex-col justify-center">
+<div class="flex min-h-0 flex-col">
 	{#if users === null || total === null}
 		<div class="my-10">
 			<Spinner className="size-5" />
 		</div>
 	{:else}
-		<div class="flex items-center justify-between px-2 mb-1">
+		<div class="flex shrink-0 items-center justify-between px-2 mb-1">
 			<div class="flex gap-1 items-center">
 				<span class="text-sm">
 					{$i18n.t('Members')}
@@ -136,7 +136,7 @@
 		<!-- <hr class="my-1 border-gray-100/5- dark:border-gray-850/50" /> -->
 
 		{#if search}
-			<div class="flex gap-1 px-1 mb-1">
+			<div class="flex shrink-0 gap-1 px-1 mb-1">
 				<div class=" flex w-full space-x-2">
 					<div class="flex flex-1 items-center">
 						<div class=" self-center ml-1 mr-3">
@@ -165,7 +165,9 @@
 		{/if}
 
 		{#if users.length > 0 || filteredApps.length > 0}
-			<div class="scrollbar-hidden relative whitespace-nowrap w-full max-w-full">
+			<div
+				class="min-h-0 overflow-y-auto overscroll-contain relative whitespace-nowrap w-full max-w-full"
+			>
 				<div class=" text-sm text-left text-gray-500 dark:text-gray-400 w-full max-w-full">
 					<!-- <div
 						class="text-xs text-gray-800 uppercase bg-transparent dark:text-gray-200 w-full mb-0.5"
@@ -325,7 +327,9 @@
 			</div>
 
 			{#if total > 30}
-				<Pagination bind:page count={total} perPage={30} />
+				<div class="shrink-0">
+					<Pagination bind:page count={total} perPage={30} />
+				</div>
 			{/if}
 		{:else}
 			<div class="text-gray-500 text-xs text-center py-5 px-10">