diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 98a54e6..2d2f372 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -44,7 +44,10 @@ export default function RootLayout({
           <SidebarProvider>
             <TitleBar />
             <AppSidebar />
-            <div className="flex h-screenish w-full overflow-x-hidden mt-12 mb-4 mr-4 border-t border-l border-border rounded-lg bg-background">
+            <div
+              id="layout-main-content-container"
+              className="flex h-screenish w-full overflow-x-hidden mt-12 mb-4 mr-4 border-t border-l border-border rounded-lg bg-background"
+            >
               {children}
             </div>
             <Toaster richColors />
diff --git a/src/components/settings/ProviderSettingsPage.tsx b/src/components/settings/ProviderSettingsPage.tsx
index 11479c3..c3f586c 100644
--- a/src/components/settings/ProviderSettingsPage.tsx
+++ b/src/components/settings/ProviderSettingsPage.tsx
@@ -43,6 +43,15 @@ export function ProviderSettingsPage({ provider }: ProviderSettingsPageProps) {
 
   // Find the specific provider data from the fetched list
   const providerData = allProviders?.find((p) => p.id === provider);
+  useEffect(() => {
+    const layoutMainContentContainer = document.getElementById(
+      "layout-main-content-container",
+    );
+    if (layoutMainContentContainer) {
+      layoutMainContentContainer.scrollTo(0, 0);
+    }
+  }, [providerData?.id]);
+
   const supportsCustomModels =
     providerData?.type === "custom" || providerData?.type === "cloud";