diff --git a/ui/src/modules/jobs/pages/SchemaConfiguration.tsx b/ui/src/modules/jobs/pages/SchemaConfiguration.tsx
index f7cbaf8a..a487c873 100644
--- a/ui/src/modules/jobs/pages/SchemaConfiguration.tsx
+++ b/ui/src/modules/jobs/pages/SchemaConfiguration.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState, useMemo, useRef } from "react"
 import { Input, Empty, Spin, Tooltip } from "antd"
+import clsx from "clsx"
 
 import { sourceService } from "../../../api"
 import { useAppStore } from "../../../store"
@@ -657,11 +658,12 @@ const SchemaConfiguration: React.FC<SchemaConfigurationProps> = ({
 					{destinationDatabase && (
 						<div className="flex w-1/2 items-center justify-start gap-1">
 							<div
-								className={`group relative rounded-md border border-neutral-disabled bg-white p-2.5 shadow-sm transition-all duration-200 ${
+								className={clsx(
+									"group relative rounded-md border border-neutral-disabled bg-white p-2.5 shadow-sm transition-all duration-200",
 									fromJobEditFlow
 										? "cursor-not-allowed bg-gray-50"
-										: "hover:border-blue-200 hover:shadow-md"
-								}`}
+										: "hover:border-blue-200 hover:shadow-md",
+								)}
 							>
 								<div className="absolute -right-2 -top-2">
 									<Tooltip title={DESTINATATION_DATABASE_TOOLTIP_TEXT}>
@@ -710,7 +712,10 @@ const SchemaConfiguration: React.FC<SchemaConfigurationProps> = ({
 						</div>
 					)}
 					<div
-						className={`flex w-1/2 flex-wrap ${destinationDatabase ? "justify-end" : "justify-start"} gap-2`}
+						className={clsx(
+							"flex w-1/2 flex-wrap gap-2",
+							destinationDatabase ? "justify-end" : "justify-start",
+						)}
 					>
 						{STREAM_FILTERS.map(filter => (
 							<FilterButton
@@ -724,9 +729,12 @@ const SchemaConfiguration: React.FC<SchemaConfigurationProps> = ({
 				</div>
 			</div>
 
-			<div className="flex">
+			<div className={clsx("flex", !loading && "rounded-[4px] border")}>
 				<div
-					className={`${activeStreamData ? "w-1/2" : "w-full"} max-h-[calc(100vh-250px)] overflow-y-auto`}
+					className={clsx(
+						activeStreamData ? "w-1/2" : "w-full",
+						"max-h-[calc(100vh-250px)] overflow-y-auto",
+					)}
 				>
 					{!loading && apiResponse?.streams ? (
 						<StreamsCollapsibleList
@@ -759,7 +767,10 @@ const SchemaConfiguration: React.FC<SchemaConfigurationProps> = ({
 				</div>
 
 				<div
-					className={`sticky top-0 mx-4 flex w-1/2 flex-col rounded-xl ${!loading ? "border" : ""} bg-white p-4 transition-all duration-150 ease-linear`}
+					className={clsx(
+						"sticky top-0 flex w-1/2 flex-col rounded-[4px] bg-white p-4 transition-all duration-150 ease-linear",
+						!loading && "border-l",
+					)}
 				>
 					{activeStreamData ? (
 						<StreamConfiguration
diff --git a/ui/src/modules/jobs/pages/streams/StreamHeader.tsx b/ui/src/modules/jobs/pages/streams/StreamHeader.tsx
index 7b3e0ab2..49b8f6d2 100644
--- a/ui/src/modules/jobs/pages/streams/StreamHeader.tsx
+++ b/ui/src/modules/jobs/pages/streams/StreamHeader.tsx
@@ -31,8 +31,8 @@ const StreamHeader: React.FC<StreamHeaderProps> = ({
 			className={clsx(
 				"flex w-full items-center justify-between border-b border-solid border-[#e5e7eb] py-3 pl-6",
 				isActiveStream
-					? "bg-primary-100"
-					: "border-l border-r bg-white hover:bg-background-primary",
+					? "bg-[#D2D8F7]"
+					: "bg-white hover:bg-background-primary",
 			)}
 		>
 			<div
diff --git a/ui/src/modules/jobs/pages/streams/StreamsCollapsibleList.tsx b/ui/src/modules/jobs/pages/streams/StreamsCollapsibleList.tsx
index e8807d06..47df41fa 100644
--- a/ui/src/modules/jobs/pages/streams/StreamsCollapsibleList.tsx
+++ b/ui/src/modules/jobs/pages/streams/StreamsCollapsibleList.tsx
@@ -1,9 +1,12 @@
-import { useEffect, useState } from "react"
+import { useEffect, useRef, useState } from "react"
 import { CaretDownIcon, CaretRightIcon } from "@phosphor-icons/react"
 import { Checkbox, Empty } from "antd"
 import clsx from "clsx"
 
-import { GroupedStreamsCollapsibleListProps } from "../../../../types"
+import {
+	GroupedStreamsCollapsibleListProps,
+	StreamData,
+} from "../../../../types"
 import StreamPanel from "./StreamPanel"
 import { useAppStore } from "../../../../store"
 import { IngestionMode } from "../../../../types/commonTypes"
@@ -35,6 +38,11 @@ const StreamsCollapsibleList = ({
 	const [targetIngestionMode, setTargetIngestionMode] = useState<IngestionMode>(
 		IngestionMode.APPEND,
 	)
+	const [sortedGroupedNamespaces, setSortedGroupedNamespaces] = useState<
+		[string, StreamData[]][]
+	>([])
+
+	const prevGroupedStreams = useRef(groupedStreams)
 
 	useEffect(() => {
 		setIngestionMode(getIngestionMode(selectedStreams))
@@ -60,6 +68,23 @@ const StreamsCollapsibleList = ({
 		}
 	}, [groupedStreams])
 
+	const dataHasChanged = () => {
+		const prev = prevGroupedStreams.current
+		const current = groupedStreams
+
+		const prevKeys = Object.keys(prev)
+		const currentKeys = Object.keys(current)
+
+		if (prevKeys.length !== currentKeys.length) return true
+
+		for (const key of currentKeys) {
+			if (!prev[key]) return true
+			if (prev[key].length !== current[key].length) return true
+		}
+
+		return false
+	}
+
 	// Update local checked status based on selectedStreams
 	useEffect(() => {
 		const newCheckedStatus = {
@@ -112,6 +137,62 @@ const StreamsCollapsibleList = ({
 		newCheckedStatus.global = allNamespacesSelected
 
 		setCheckedStatus(newCheckedStatus)
+
+		// sort the namespaces and streams inside it alphabetically on the basis of checked and unchecked status
+		if (sortedGroupedNamespaces.length === 0 || dataHasChanged()) {
+			const sortStreamsByCheckedStatus = (
+				streams: StreamData[],
+				namespace: string,
+			): StreamData[] => {
+				const checked: StreamData[] = []
+				const unchecked: StreamData[] = []
+
+				streams.forEach(stream => {
+					const isChecked =
+						newCheckedStatus.streams[namespace]?.[stream.stream.name]
+					if (isChecked) checked.push(stream)
+					else unchecked.push(stream)
+				})
+
+				const sortByStreamName = (a: StreamData, b: StreamData) =>
+					a.stream.name.localeCompare(b.stream.name)
+
+				checked.sort(sortByStreamName)
+				unchecked.sort(sortByStreamName)
+
+				return [...checked, ...unchecked]
+			}
+
+			const namespacesWithCheckedStreams: [string, StreamData[]][] = []
+			const namespacesWithoutCheckedStreams: [string, StreamData[]][] = []
+
+			Object.entries(groupedStreams).forEach(([namespace, streams]) => {
+				const hasAnySelectedStream = streams.some(
+					stream => newCheckedStatus.streams[namespace]?.[stream.stream.name],
+				)
+
+				const sortedStreams = sortStreamsByCheckedStatus(streams, namespace)
+
+				if (hasAnySelectedStream)
+					namespacesWithCheckedStreams.push([namespace, sortedStreams])
+				else namespacesWithoutCheckedStreams.push([namespace, sortedStreams])
+			})
+
+			const sortByNamespaceName = (
+				a: [string, StreamData[]],
+				b: [string, StreamData[]],
+			) => a[0].localeCompare(b[0])
+
+			namespacesWithCheckedStreams.sort(sortByNamespaceName)
+			namespacesWithoutCheckedStreams.sort(sortByNamespaceName)
+
+			setSortedGroupedNamespaces([
+				...namespacesWithCheckedStreams,
+				...namespacesWithoutCheckedStreams,
+			])
+
+			prevGroupedStreams.current = groupedStreams
+		}
 	}, [selectedStreams, groupedStreams])
 
 	const handleToggleNamespace = (ns: string) => {
@@ -240,11 +321,11 @@ const StreamsCollapsibleList = ({
 	return (
 		<>
 			<div className="flex h-full flex-col rounded-[4px] border-gray-200">
-				{Object.keys(groupedStreams).length === 0 ? (
+				{Object.keys(sortedGroupedNamespaces).length === 0 ? (
 					<Empty className="pt-10" />
 				) : (
 					<>
-						<div className="flex items-center justify-between rounded-t-[4px] border border-b-0 bg-white px-2 py-4">
+						<div className="flex items-center justify-between rounded-t-[4px] bg-white px-2 py-4">
 							<Checkbox
 								checked={checkedStatus.global}
 								onChange={e => handleGlobalSyncAll(e.target.checked)}
@@ -300,11 +381,11 @@ const StreamsCollapsibleList = ({
 								</div>
 							</div>
 						</div>
-						{Object.entries(groupedStreams).map(([ns, streams]) => {
+						{sortedGroupedNamespaces.map(([ns, streams]) => {
 							return (
 								<div
 									key={ns}
-									className="border-solid border-gray-200"
+									className="border-gray-200"
 								>
 									<div
 										className="flex cursor-pointer items-center border bg-background-primary p-3"