diff --git a/apps/web/modules/event-types/views/event-types-listing-view.tsx b/apps/web/modules/event-types/views/event-types-listing-view.tsx
index 680260a10f..ae00c1a963 100644
--- a/apps/web/modules/event-types/views/event-types-listing-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-listing-view.tsx
@@ -1105,4 +1105,4 @@ const EventTypesPage = ({ userEventGroupsData, user }: Props) => {
 
 export const SearchContext: React.Context<SearchContextType | undefined> = SearchContextInternal;
 
-export default EventTypesPage;
+export default EventTypesPage;
\ No newline at end of file
diff --git a/apps/web/modules/settings/developer/oauth-clients-view.tsx b/apps/web/modules/settings/developer/oauth-clients-view.tsx
index 4956dddc3c..3cbcd0fc37 100644
--- a/apps/web/modules/settings/developer/oauth-clients-view.tsx
+++ b/apps/web/modules/settings/developer/oauth-clients-view.tsx
@@ -112,30 +112,35 @@ const OAuthClientsView = () => {
     <SettingsHeader
       title={t("oauth_clients")}
       description={t("oauth_clients_description")}
-      CTA={newOAuthClientButton}>
-      {oAuthClients && oAuthClients.length > 0 ? (
-        <OAuthClientsList
-          clients={oAuthClients.map((client) => ({
-            clientId: client.clientId,
-            name: client.name,
-            purpose: client.purpose,
-            redirectUri: client.redirectUri,
-            websiteUrl: client.websiteUrl,
-            logo: client.logo,
-            status: client.status,
-            rejectionReason: client.rejectionReason,
-            clientType: client.clientType,
-          }))}
-          onSelectClient={(client) => setSelectedClient(client)}
-        />
-      ) : (
-        <EmptyScreen
-          Icon="key"
-          headline={t("no_oauth_clients")}
-          description={t("no_oauth_clients_description")}
-          buttonRaw={newOAuthClientButton}
-        />
-      )}
+      CTA={newOAuthClientButton}
+      borderInShellHeader={true}>
+      <div>
+        {oAuthClients && oAuthClients.length > 0 ? (
+          <div className="border-subtle rounded-b-lg border border-t-0">
+            <OAuthClientsList
+              clients={oAuthClients.map((client) => ({
+                clientId: client.clientId,
+                name: client.name,
+                purpose: client.purpose,
+                redirectUri: client.redirectUri,
+                websiteUrl: client.websiteUrl,
+                logo: client.logo,
+                status: client.status,
+                rejectionReason: client.rejectionReason,
+                clientType: client.clientType,
+              }))}
+              onSelectClient={(client) => setSelectedClient(client)}
+            />
+          </div>
+        ) : (
+          <EmptyScreen
+            Icon="key"
+            headline={t("no_oauth_clients")}
+            description={t("no_oauth_clients_description")}
+            className="rounded-b-lg rounded-t-none border-t-0"
+            buttonRaw={newOAuthClientButton}
+          />
+        )}</div>
 
       {submittedClient ? (
         <OAuthClientPreviewDialog
diff --git a/apps/web/modules/settings/oauth/OAuthClientsList.tsx b/apps/web/modules/settings/oauth/OAuthClientsList.tsx
index 403dd6b35a..6baf22dab5 100644
--- a/apps/web/modules/settings/oauth/OAuthClientsList.tsx
+++ b/apps/web/modules/settings/oauth/OAuthClientsList.tsx
@@ -34,7 +34,7 @@ export const OAuthClientsList = ({
   const { t } = useLocale();
 
   return (
-    <div className="border-subtle rounded-lg border" data-testid="oauth-clients-list">
+    <div data-testid="oauth-clients-list">
       {clients.map((client, index) => (
         <div
           key={client.clientId}