diff --git a/src-web/components/GrpcConnectionLayout.tsx b/src-web/components/GrpcConnectionLayout.tsx
index b8e881ca..5de7415f 100644
--- a/src-web/components/GrpcConnectionLayout.tsx
+++ b/src-web/components/GrpcConnectionLayout.tsx
@@ -54,11 +54,11 @@ export function GrpcConnectionLayout({ style }: Props) {
   const grpc = useGrpc(url.value ?? null, activeRequestId);
 
   const activeMethod = useMemo(() => {
-    if (grpc.schema == null) return null;
-    const s = grpc.schema.find((s) => s.name === service.value);
+    if (grpc.services == null) return null;
+    const s = grpc.services.find((s) => s.name === service.value);
     if (s == null) return null;
     return s.methods.find((m) => m.name === method.value);
-  }, [grpc.schema, method.value, service.value]);
+  }, [grpc.services, method.value, service.value]);
 
   const handleCancel = useCallback(() => {
     grpc.cancel.mutateAsync().catch(console.error);
@@ -111,12 +111,11 @@ export function GrpcConnectionLayout({ style }: Props) {
   );
 
   useEffect(() => {
-    console.log('GrpcConnectionLayout');
-    if (grpc.schema == null) return;
-    const s = grpc.schema.find((s) => s.name === service.value);
+    if (grpc.services == null) return;
+    const s = grpc.services.find((s) => s.name === service.value);
     if (s == null) {
-      service.set(grpc.schema[0]?.name ?? null);
-      method.set(grpc.schema[0]?.methods[0]?.name ?? null);
+      service.set(grpc.services[0]?.name ?? null);
+      method.set(grpc.services[0]?.methods[0]?.name ?? null);
       return;
     }
 
@@ -125,7 +124,7 @@ export function GrpcConnectionLayout({ style }: Props) {
       method.set(s.methods[0]?.name ?? null);
       return;
     }
-  }, [grpc.schema, method, service]);
+  }, [grpc.services, method, service]);
 
   const handleChangeService = useCallback(
     (v: string) => {
@@ -139,7 +138,7 @@ export function GrpcConnectionLayout({ style }: Props) {
 
   const select = useMemo(() => {
     const options =
-      grpc.schema?.flatMap((s) =>
+      grpc.services?.flatMap((s) =>
         s.methods.map((m) => ({
           label: `${s.name.split('.', 2).pop() ?? s.name}/${m.name}`,
           value: `${s.name}/${m.name}`,
@@ -147,7 +146,7 @@ export function GrpcConnectionLayout({ style }: Props) {
       ) ?? [];
     const value = `${service.value ?? ''}/${method.value ?? ''}`;
     return { value, options };
-  }, [grpc.schema, method.value, service.value]);
+  }, [grpc.services, method.value, service.value]);
 
   const [paneSize, setPaneSize] = useState(99999);
   const urlContainerEl = useRef<HTMLDivElement>(null);
@@ -162,14 +161,14 @@ export function GrpcConnectionLayout({ style }: Props) {
   return (
     <SplitLayout
       name="grpc_layout"
-      className="p-3"
+      className="p-3 gap-1.5"
       style={style}
       leftSlot={() => (
         <VStack space={2}>
           <div
             ref={urlContainerEl}
             className={classNames(
-              'grid grid-cols-[minmax(0,1fr)_auto_auto] gap-1.5',
+              'grid grid-cols-[minmax(0,1fr)_auto] gap-1.5',
               paneSize < 400 && '!grid-cols-1',
             )}
           >
diff --git a/src-web/components/GrpcEditor.tsx b/src-web/components/GrpcEditor.tsx
index 6decbfb3..771cf3e0 100644
--- a/src-web/components/GrpcEditor.tsx
+++ b/src-web/components/GrpcEditor.tsx
@@ -1,6 +1,7 @@
 import type { EditorView } from 'codemirror';
 import { updateSchema } from 'codemirror-json-schema';
 import { useEffect, useRef } from 'react';
+import { useActiveRequestId } from '../hooks/useActiveRequestId';
 import { useAlert } from '../hooks/useAlert';
 import { useGrpc } from '../hooks/useGrpc';
 import { tryFormatJson } from '../lib/formatters';
@@ -21,12 +22,13 @@ type Props = Pick<
 
 export function GrpcEditor({ url, service, method, defaultValue, ...extraEditorProps }: Props) {
   const editorViewRef = useRef<EditorView>(null);
-  const grpc = useGrpc(url);
+  const activeRequestId = useActiveRequestId();
+  const grpc = useGrpc(url, activeRequestId);
   const alert = useAlert();
 
   useEffect(() => {
-    if (editorViewRef.current == null || grpc.schema == null) return;
-    const s = grpc.schema?.find((s) => s.name === service);
+    if (editorViewRef.current == null || grpc.services == null) return;
+    const s = grpc.services?.find((s) => s.name === service);
     if (service != null && s == null) {
       alert({
         id: 'grpc-find-service-error',
@@ -77,7 +79,7 @@ export function GrpcEditor({ url, service, method, defaultValue, ...extraEditorP
       });
       console.log('Failed to parse method schema', method, schema);
     }
-  }, [alert, grpc.schema, method, service]);
+  }, [alert, grpc.services, method, service]);
 
   return (
     <div className="h-full w-full grid grid-cols-1 grid-rows-[minmax(0,100%)_auto_auto_minmax(0,auto)]">
diff --git a/src-web/components/HttpRequestLayout.tsx b/src-web/components/HttpRequestLayout.tsx
index ddf8e5a0..db6f51d4 100644
--- a/src-web/components/HttpRequestLayout.tsx
+++ b/src-web/components/HttpRequestLayout.tsx
@@ -12,7 +12,7 @@ export function HttpRequestLayout({ style }: Props) {
   return (
     <SplitLayout
       name="http_layout"
-      className="p-3"
+      className="p-3 gap-1.5"
       style={style}
       leftSlot={({ orientation, style }) => (
         <RequestPane style={style} fullHeight={orientation === 'horizontal'} />
diff --git a/src-web/hooks/useGrpc.ts b/src-web/hooks/useGrpc.ts
index 12676cf6..f10376d3 100644
--- a/src-web/hooks/useGrpc.ts
+++ b/src-web/hooks/useGrpc.ts
@@ -2,7 +2,6 @@ import { useMutation, useQuery } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api';
 import type { UnlistenFn } from '@tauri-apps/api/event';
 import { emit, listen } from '@tauri-apps/api/event';
-import { type } from '@tauri-apps/api/os';
 import { useEffect, useRef, useState } from 'react';
 import { tryFormatJson } from '../lib/formatters';
 import { useKeyValue } from './useKeyValue';
@@ -147,7 +146,7 @@ export function useGrpc(url: string | null, requestId: string | null) {
     unary,
     serverStreaming,
     bidiStreaming,
-    schema: reflect.data,
+    services: reflect.data,
     cancel,
     messages,
     isStreaming: activeConnectionId !== null,