diff --git a/apps/canvas/front/src/Tools.tsx b/apps/canvas/front/src/Tools.tsx
index c185d45..f355d3e 100644
--- a/apps/canvas/front/src/Tools.tsx
+++ b/apps/canvas/front/src/Tools.tsx
@@ -14,7 +14,10 @@
 					<div>Messages</div>
 					<Badge>{messages.length}</Badge>
 				</TabsTrigger>
-				<TabsTrigger value="gateways">Gateways</TabsTrigger>
+				<TabsTrigger value="gateways" className="space-x-2">
+					<div>Gateways</div>
+					<Badge>{env.access.length}</Badge>
+				</TabsTrigger>
 				<TabsTrigger value="deployKeys">Deploy keys</TabsTrigger>
 			</TabsList>
 			<div className="!overflow-y-auto p-1">
@@ -24,7 +27,7 @@
 				<TabsContent value="gateways">
 					<Gateways />
 				</TabsContent>
-				<TabsContent value="deployKeys">{env && <>{env.deployKey}</>}</TabsContent>
+				<TabsContent value="deployKeys">{env.deployKey && <>{env.deployKey}</>}</TabsContent>
 			</div>
 		</Tabs>
 	);