diff --git a/src/components/Common/Beta.tsx b/src/components/Common/Beta.tsx
index c381ae3..2151dea 100644
--- a/src/components/Common/Beta.tsx
+++ b/src/components/Common/Beta.tsx
@@ -1,8 +1,8 @@
 import { Tag } from "antd"
 import { useTranslation } from "react-i18next"
 
-export const BetaTag = () => {
+export const BetaTag = ({className} : {className?: string}) => {
   const { t } = useTranslation("common")
 
-  return <Tag color="yellow">{t("beta")}</Tag>
+  return <Tag className={className} color="yellow">{t("beta")}</Tag>
 }
diff --git a/src/components/Layouts/Layout.tsx b/src/components/Layouts/Layout.tsx
index 9ff5fcc..0fe494f 100644
--- a/src/components/Layouts/Layout.tsx
+++ b/src/components/Layouts/Layout.tsx
@@ -24,7 +24,6 @@ import { SelectedKnowledge } from "../Option/Knowledge/SelectedKnwledge"
 import { useStorage } from "@plasmohq/storage/hook"
 import { ModelSelect } from "../Common/ModelSelect"
 import { PromptSelect } from "../Common/PromptSelect"
-import { ChatSettings } from "../Icons/ChatSettings"
 import { CurrentChatModelSettings } from "../Common/Settings/CurrentChatModelSettings"
 
 export default function OptionLayout({
@@ -36,6 +35,10 @@ export default function OptionLayout({
   const { t } = useTranslation(["option", "common"])
   const [shareModeEnabled] = useStorage("shareMode", false)
   const [openModelSettings, setOpenModelSettings] = useState(false)
+  const [hideCurrentChatModelSettings] = useStorage(
+    "hideCurrentChatModelSettings",
+    false
+  )
 
   const {
     selectedModel,
@@ -194,13 +197,15 @@ export default function OptionLayout({
             <div className="flex flex-1 justify-end px-4">
               <div className="ml-4 flex items-center md:ml-6">
                 <div className="flex gap-4 items-center">
-                  <Tooltip title={t("common:currentChatModelSettings")}>
-                    <button
-                      onClick={() => setOpenModelSettings(true)}
-                      className="!text-gray-500 dark:text-gray-300 hover:text-gray-600 dark:hover:text-gray-300 transition-colors">
-                      <BrainCog className="w-6 h-6" />
-                    </button>
-                  </Tooltip>
+                  {!hideCurrentChatModelSettings && (
+                    <Tooltip title={t("common:currentChatModelSettings")}>
+                      <button
+                        onClick={() => setOpenModelSettings(true)}
+                        className="!text-gray-500 dark:text-gray-300 hover:text-gray-600 dark:hover:text-gray-300 transition-colors">
+                        <BrainCog className="w-6 h-6" />
+                      </button>
+                    </Tooltip>
+                  )}
                   {pathname === "/" &&
                     messages.length > 0 &&
                     !streaming &&
diff --git a/src/components/Option/Settings/model-settings.tsx b/src/components/Option/Settings/model-settings.tsx
index 8db7661..7996a73 100644
--- a/src/components/Option/Settings/model-settings.tsx
+++ b/src/components/Option/Settings/model-settings.tsx
@@ -1,13 +1,11 @@
+import { BetaTag } from "@/components/Common/Beta"
 import { SaveButton } from "@/components/Common/SaveButton"
 import { getAllModelSettings, setModelSetting } from "@/services/model-settings"
 import { useQuery, useQueryClient } from "@tanstack/react-query"
 import { Form, Skeleton, Input, InputNumber, Collapse } from "antd"
 import React from "react"
 import { useTranslation } from "react-i18next"
-// keepAlive?: string
-// temperature?: number
-// topK?: number
-// topP?: number
+
 
 export const ModelSettings = () => {
   const { t } = useTranslation("common")
@@ -25,9 +23,12 @@ export const ModelSettings = () => {
   return (
     <div>
       <div>
+        <div className="inline-flex items-center gap-3">
+        <BetaTag />
         <h2 className="text-base font-semibold leading-7 text-gray-900 dark:text-white">
-          {t("modelSettings.label")}
+          {t("modelSettings.label")} 
         </h2>
+        </div>
         <p className="text-sm text-gray-500 dark:text-neutral-400 mt-1">
           {t("modelSettings.description")}
         </p>
diff --git a/src/components/Option/Settings/other.tsx b/src/components/Option/Settings/other.tsx
index d4c7c25..e05a9b8 100644
--- a/src/components/Option/Settings/other.tsx
+++ b/src/components/Option/Settings/other.tsx
@@ -2,7 +2,7 @@ import { useQueryClient } from "@tanstack/react-query"
 import { useDarkMode } from "~/hooks/useDarkmode"
 import { useMessageOption } from "~/hooks/useMessageOption"
 import { PageAssitDatabase } from "@/db"
-import { Select } from "antd"
+import { Select, Switch } from "antd"
 import { SUPPORTED_LANGUAGES } from "~/utils/supporetd-languages"
 import { MoonIcon, SunIcon } from "lucide-react"
 import { SearchModeSettings } from "./search-mode"
@@ -14,11 +14,20 @@ import {
   importPageAssistData
 } from "@/libs/export-import"
 import { BetaTag } from "@/components/Common/Beta"
+import { useStorage } from "@plasmohq/storage/hook"
 
 export const SettingOther = () => {
   const { clearChat, speechToTextLanguage, setSpeechToTextLanguage } =
     useMessageOption()
 
+  const [copilotResumeLastChat, setCopilotResumeLastChat] = useStorage(
+    "copilotResumeLastChat",
+    false
+  )
+
+  const [hideCurrentChatModelSettings, setHideCurrentChatModelSettings] =
+    useStorage("hideCurrentChatModelSettings", false)
+
   const queryClient = useQueryClient()
 
   const { mode, toggleDarkMode } = useDarkMode()
@@ -34,7 +43,7 @@ export const SettingOther = () => {
         <div className="border border-b border-gray-200 dark:border-gray-600 mt-3"></div>
       </div>
       <div className="flex flex-row justify-between">
-        <span className="text-gray-500   dark:text-neutral-50">
+        <span className="text-gray-500 dark:text-neutral-50">
           {t("generalSettings.settings.speechRecognitionLang.label")}
         </span>
 
@@ -76,6 +85,29 @@ export const SettingOther = () => {
           }}
         />
       </div>
+      <div className="flex flex-row justify-between">
+        <span className="text-gray-500   dark:text-neutral-50">
+          {t("generalSettings.settings.copilotResumeLastChat.label")}
+        </span>
+
+        <Switch
+          checked={copilotResumeLastChat}
+          onChange={(checked) => setCopilotResumeLastChat(checked)}
+        />
+      </div>
+      <div className="flex flex-row justify-between">
+        <div className="inline-flex items-center gap-2">
+          <BetaTag />
+          <span className="text-gray-500   dark:text-neutral-50">
+            {t("generalSettings.settings.hideCurrentChatModelSettings.label")}
+          </span>
+        </div>
+
+        <Switch
+          checked={hideCurrentChatModelSettings}
+          onChange={(checked) => setHideCurrentChatModelSettings(checked)}
+        />
+      </div>
       <div className="flex flex-row justify-between">
         <span className="text-gray-500 dark:text-neutral-50 ">
           {t("generalSettings.settings.darkMode.label")}
@@ -129,7 +161,7 @@ export const SettingOther = () => {
         </div>
         <div className="flex flex-row mb-3 justify-between">
           <span className="text-gray-500 dark:text-neutral-50 ">
-          <BetaTag />    {t("generalSettings.system.export.label")}
+            {t("generalSettings.system.export.label")}
           </span>
           <button
             onClick={exportPageAssistData}
@@ -139,7 +171,7 @@ export const SettingOther = () => {
         </div>
         <div className="flex flex-row mb-3 justify-between">
           <span className="text-gray-500 dark:text-neutral-50 ">
-          <BetaTag /> {t("generalSettings.system.import.label")}
+            {t("generalSettings.system.import.label")}
           </span>
           <label
             htmlFor="import"
diff --git a/src/components/Sidepanel/Chat/header.tsx b/src/components/Sidepanel/Chat/header.tsx
index c90cadb..5970a7c 100644
--- a/src/components/Sidepanel/Chat/header.tsx
+++ b/src/components/Sidepanel/Chat/header.tsx
@@ -6,7 +6,13 @@ import { BoxesIcon, BrainCog, CogIcon, EraserIcon } from "lucide-react"
 import { useTranslation } from "react-i18next"
 import { CurrentChatModelSettings } from "@/components/Common/Settings/CurrentChatModelSettings"
 import React from "react"
+import { useStorage } from "@plasmohq/storage/hook"
 export const SidepanelHeader = () => {
+  const [hideCurrentChatModelSettings] = useStorage(
+    "hideCurrentChatModelSettings",
+    false
+  )
+
   const { clearChat, isEmbedding, messages, streaming } = useMessage()
   const { t } = useTranslation(["sidepanel", "common"])
   const [openModelSettings, setOpenModelSettings] = React.useState(false)
@@ -43,13 +49,15 @@ export const SidepanelHeader = () => {
             <HistoryIcon className="h-5 w-5 text-gray-500 dark:text-gray-400" />
           </Link>
         </Tooltip> */}
-        <Tooltip title={t("common:currentChatModelSettings")}>
-          <button
-            onClick={() => setOpenModelSettings(true)}
-            className="text-gray-500 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 transition-colors">
-            <BrainCog className="w-5 h-5" />
-          </button>
-        </Tooltip>
+        {!hideCurrentChatModelSettings && (
+          <Tooltip title={t("common:currentChatModelSettings")}>
+            <button
+              onClick={() => setOpenModelSettings(true)}
+              className="text-gray-500 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 transition-colors">
+              <BrainCog className="w-5 h-5" />
+            </button>
+          </Tooltip>
+        )}
         <Link to="/settings">
           <CogIcon className="h-5 w-5 text-gray-500 dark:text-gray-400" />
         </Link>
diff --git a/src/routes/sidepanel-chat.tsx b/src/routes/sidepanel-chat.tsx
index 84e6c15..112cdc5 100644
--- a/src/routes/sidepanel-chat.tsx
+++ b/src/routes/sidepanel-chat.tsx
@@ -3,6 +3,7 @@ import {
   formatToMessage,
   getRecentChatFromCopilot
 } from "@/db"
+import { copilotResumeLastChat } from "@/services/app"
 import React from "react"
 import { SidePanelBody } from "~/components/Sidepanel/Chat/body"
 import { SidepanelForm } from "~/components/Sidepanel/Chat/form"
@@ -19,6 +20,11 @@ const SidepanelChat = () => {
     useMessage()
 
   const setRecentMessagesOnLoad = async () => {
+
+    const isEnabled = await copilotResumeLastChat();
+    if (!isEnabled) {
+      return;
+    }
     if (messages.length === 0) {
       const recentChat = await getRecentChatFromCopilot()
       if (recentChat) {
@@ -86,6 +92,11 @@ const SidepanelChat = () => {
     }
   }, [])
 
+
+  React.useEffect(() => {
+    setRecentMessagesOnLoad()
+  }, [])
+
   return (
     <div
       ref={drop}
diff --git a/src/services/app.ts b/src/services/app.ts
index 8f0cc66..e7d871a 100644
--- a/src/services/app.ts
+++ b/src/services/app.ts
@@ -34,3 +34,8 @@ export const getAdvancedOllamaSettings = async () => {
     rewriteUrl
   }
 }
+
+
+export const copilotResumeLastChat = async () => {
+  return await storage.get<boolean>("copilotResumeLastChat")
+}
\ No newline at end of file