diff --git a/web/src/app/chat/modal/SetDefaultModelModal.tsx b/web/src/app/chat/modal/SetDefaultModelModal.tsx
index d8d75679d28d..a54507ee2a0e 100644
--- a/web/src/app/chat/modal/SetDefaultModelModal.tsx
+++ b/web/src/app/chat/modal/SetDefaultModelModal.tsx
@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction } from "react";
+import { Dispatch, SetStateAction, useEffect, useRef } from "react";
 import { ModalWrapper } from "./ModalWrapper";
 import { Badge, Text } from "@tremor/react";
 import { getDisplayNameForModel, LlmOverride } from "@/lib/hooks";
@@ -21,6 +21,26 @@ export function SetDefaultModelModal({
   defaultModel: string | null;
 }) {
   const { popup, setPopup } = usePopup();
+  const containerRef = useRef<HTMLDivElement>(null);
+  const messageRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const container = containerRef.current;
+    const message = messageRef.current;
+
+    if (container && message) {
+      const checkScrollable = () => {
+        if (container.scrollHeight > container.clientHeight) {
+          message.style.display = "block";
+        } else {
+          message.style.display = "none";
+        }
+      };
+      checkScrollable();
+      window.addEventListener("resize", checkScrollable);
+      return () => window.removeEventListener("resize", checkScrollable);
+    }
+  }, []);
 
   const defaultModelDestructured = defaultModel
     ? destructureValue(defaultModel)
@@ -101,7 +121,7 @@ export function SetDefaultModelModal({
   return (
     <ModalWrapper
       onClose={onClose}
-      modalClassName="rounded-lg bg-white max-w-xl"
+      modalClassName="rounded-lg  bg-white max-w-xl"
     >
       <>
         {popup}
@@ -116,56 +136,68 @@ export function SetDefaultModelModal({
           assistants that don&apos;t have a default model assigned.
           {defaultModel == null && "  No default model has been selected!"}
         </Text>
-        <div className="w-full flex text-sm flex-col">
+        <div
+          className="w-full max-h-96 overflow-y-auto flex text-sm flex-col border rounded-md"
+          ref={containerRef}
+        >
           <div
-            key={-1}
-            className="w-full border-b flex items-center gap-x-2 hover:bg-background-50"
+            ref={messageRef}
+            className="sticky top-0 bg-background-100 p-2 text-xs text-emphasis font-medium"
+            style={{ display: "none" }}
           >
-            <input
-              checked={defaultModelDestructured?.modelName == null}
-              type="radio"
-              name="credentialSelection"
-              onChange={(e) => {
-                e.preventDefault();
-                handleChangedefaultModel(null);
-              }}
-              className="form-radio ml-4 h-4 w-4 text-blue-600 transition duration-150 ease-in-out"
-            />
-            {
-              <td className="p-2">
-                System default{" "}
-                {defaultProvider?.default_model_name &&
-                  `(${getDisplayNameForModel(defaultProvider?.default_model_name)})`}
-              </td>
-            }
+            Scroll to see all options
           </div>
-
-          {llmOptions.map(({ name, value }, index) => {
-            return (
-              <div
-                key={index}
-                className="w-full flex items-center gap-x-2 border-b hover:bg-background-50"
-              >
-                <input
-                  checked={defaultModelDestructured?.modelName == name}
-                  type="radio"
-                  name="credentialSelection"
-                  onChange={(e) => {
-                    e.preventDefault();
-                    handleChangedefaultModel(value);
-                  }}
-                  className="form-radio ml-4 h-4 w-4 text-blue-600 transition duration-150 ease-in-out"
-                />
-
+          <div>
+            <div
+              key={-1}
+              className="w-full border-b flex items-center gap-x-2 hover:bg-background-50"
+            >
+              <input
+                checked={defaultModelDestructured?.modelName == null}
+                type="radio"
+                name="credentialSelection"
+                onChange={(e) => {
+                  e.preventDefault();
+                  handleChangedefaultModel(null);
+                }}
+                className="form-radio ml-4 h-4 w-4 text-blue-600 transition duration-150 ease-in-out"
+              />
+              {
                 <td className="p-2">
-                  {getDisplayNameForModel(name)}{" "}
-                  {defaultModelDestructured &&
-                    defaultModelDestructured.name == name &&
-                    "(selected)"}
+                  System default{" "}
+                  {defaultProvider?.default_model_name &&
+                    `(${getDisplayNameForModel(defaultProvider?.default_model_name)})`}
                 </td>
-              </div>
-            );
-          })}
+              }
+            </div>
+
+            {llmOptions.map(({ name, value }, index) => {
+              return (
+                <div
+                  key={index}
+                  className="w-full flex items-center gap-x-2 border-b hover:bg-background-50"
+                >
+                  <input
+                    checked={defaultModelDestructured?.modelName == name}
+                    type="radio"
+                    name="credentialSelection"
+                    onChange={(e) => {
+                      e.preventDefault();
+                      handleChangedefaultModel(value);
+                    }}
+                    className="form-radio ml-4 h-4 w-4 text-blue-600 transition duration-150 ease-in-out"
+                  />
+
+                  <td className="p-2">
+                    {getDisplayNameForModel(name)}{" "}
+                    {defaultModelDestructured &&
+                      defaultModelDestructured.name == name &&
+                      "(selected)"}
+                  </td>
+                </div>
+              );
+            })}
+          </div>
         </div>
       </>
     </ModalWrapper>