diff --git a/apps/web/app/(org)/dashboard/_components/DashboardInner.tsx b/apps/web/app/(org)/dashboard/_components/DashboardInner.tsx
index 7c57dab3f8a..eff12c36216 100644
--- a/apps/web/app/(org)/dashboard/_components/DashboardInner.tsx
+++ b/apps/web/app/(org)/dashboard/_components/DashboardInner.tsx
@@ -45,9 +45,6 @@ import {
 import type { DownloadIconHandle } from "./AnimatedIcons/Download";
 import type { ReferIconHandle } from "./AnimatedIcons/Refer";
 
-export const navItemClass =
-	"flex items-center justify-start rounded-xl outline-none tracking-tight overflow-hidden";
-
 export default function DashboardInner({
 	children,
 }: {
diff --git a/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx b/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
index b0ddcad51d8..bdf4f15faea 100644
--- a/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
+++ b/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
@@ -42,9 +42,6 @@ interface Props {
 	toggleMobileNav?: () => void;
 }
 
-export const navItemClass =
-	"flex items-center justify-start rounded-xl outline-none tracking-tight overflow-hidden";
-
 const AdminNavItems = ({ toggleMobileNav }: Props) => {
 	const pathname = usePathname();
 	const [open, setOpen] = useState(false);
@@ -191,7 +188,7 @@ const AdminNavItems = ({ toggleMobileNav }: Props) => {
 															? "pointer-events-none"
 															: "text-gray-10 hover:text-gray-12 hover:bg-gray-6",
 													)}
-													key={organization.organization.name + "-organization"}
+													key={`${organization.organization.name}-organization`}
 													onSelect={async () => {
 														await updateActiveOrganization(
 															organization.organization.id,
@@ -436,7 +433,7 @@ const NavItem = ({
 					isPathActive(href)
 						? "bg-transparent pointer-events-none"
 						: "hover:bg-gray-2",
-					navItemClass,
+					"flex overflow-hidden justify-start items-center tracking-tight rounded-xl outline-none",
 				)}
 			>
 				{cloneElement(icon, {
diff --git a/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx b/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx
index 0b7588e365a..ad77e09ce7b 100644
--- a/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx
+++ b/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx
@@ -23,7 +23,6 @@ import type { Spaces } from "../../dashboard-data";
 import { LayersIcon } from "../AnimatedIcons";
 import type { LayersIconHandle } from "../AnimatedIcons/Layers";
 import { ConfirmationDialog } from "../ConfirmationDialog";
-import { navItemClass } from "./Items";
 import SpaceDialog from "./SpaceDialog";
 
 const SpacesList = ({ toggleMobileNav }: { toggleMobileNav?: () => void }) => {
@@ -181,7 +180,7 @@ const SpacesList = ({ toggleMobileNav }: { toggleMobileNav?: () => void }) => {
 						pathname.includes("/dashboard/spaces/browse")
 							? "bg-gray-3 pointer-events-none"
 							: "hover:bg-gray-2",
-						navItemClass,
+						"flex items-center justify-start rounded-xl outline-none tracking-tight overflow-hidden",
 					)}
 				>
 					<LayersIcon