diff --git a/src/renderer/src/pages/home/Navbar.tsx b/src/renderer/src/pages/home/Navbar.tsx
index 5e7579ee9..ec2998663 100644
--- a/src/renderer/src/pages/home/Navbar.tsx
+++ b/src/renderer/src/pages/home/Navbar.tsx
@@ -66,6 +66,36 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
     })
   }
 
+  const ControlButtons: FC<{ IconComponent: typeof NavbarIcon }> = ({ IconComponent }) => (
+    <>
+      <Tooltip title={t('chat.assistant.search.placeholder')} mouseEnterDelay={0.8}>
+        <IconComponent onClick={() => SearchPopup.show()}>
+          <Search size={18} />
+        </IconComponent>
+      </Tooltip>
+      <Tooltip title={t('navbar.expand')} mouseEnterDelay={0.8}>
+        <IconComponent onClick={handleNarrowModeToggle}>
+          <i className="iconfont icon-icon-adaptive-width"></i>
+        </IconComponent>
+      </Tooltip>
+      <UpdateAppButton />
+      {topicPosition === 'right' && !showTopics && (
+        <Tooltip title={t('navbar.show_sidebar')} mouseEnterDelay={2}>
+          <NavbarIcon onClick={toggleShowTopics}>
+            <PanelLeftClose size={18} />
+          </NavbarIcon>
+        </Tooltip>
+      )}
+      {topicPosition === 'right' && showTopics && (
+        <Tooltip title={t('navbar.hide_sidebar')} mouseEnterDelay={2}>
+          <NavbarIcon onClick={toggleShowTopics}>
+            <PanelRightClose size={18} />
+          </NavbarIcon>
+        </Tooltip>
+      )}
+    </>
+  )
+
   return (
     <Navbar className="home-navbar">
       <AnimatePresence initial={false}>
@@ -114,36 +144,8 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
           <SelectModelButton assistant={assistant} />
         </HStack>
         <HStack alignItems="center" gap={6}>
-          <UpdateAppButton />
-          {topicPosition === 'right' && !showTopics && (
-            <Tooltip title={t('navbar.show_sidebar')} mouseEnterDelay={2}>
-              <NavbarIcon onClick={toggleShowTopics}>
-                <PanelLeftClose size={18} />
-              </NavbarIcon>
-            </Tooltip>
-          )}
-          {topicPosition === 'right' && showTopics && (
-            <Tooltip title={t('navbar.hide_sidebar')} mouseEnterDelay={2}>
-              <NavbarIcon onClick={toggleShowTopics}>
-                <PanelRightClose size={18} />
-              </NavbarIcon>
-            </Tooltip>
-          )}
           {/* For Mac, show search and expand without WindowControls */}
-          {!isWin && !isLinux && (
-            <>
-              <Tooltip title={t('chat.assistant.search.placeholder')} mouseEnterDelay={0.8}>
-                <NarrowIcon onClick={() => SearchPopup.show()}>
-                  <Search size={18} />
-                </NarrowIcon>
-              </Tooltip>
-              <Tooltip title={t('navbar.expand')} mouseEnterDelay={0.8}>
-                <NarrowIcon onClick={handleNarrowModeToggle}>
-                  <i className="iconfont icon-icon-adaptive-width"></i>
-                </NarrowIcon>
-              </Tooltip>
-            </>
-          )}
+          {!isWin && !isLinux && <ControlButtons IconComponent={NarrowIcon} />}
         </HStack>
         {/* Search, Expand and WindowControls positioned at the right edge */}
         {(isWin || isLinux) && (
@@ -157,16 +159,7 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
               alignItems: 'center',
               gap: 6
             }}>
-            <Tooltip title={t('chat.assistant.search.placeholder')} mouseEnterDelay={0.8}>
-              <NavbarIcon onClick={() => SearchPopup.show()}>
-                <Search size={18} />
-              </NavbarIcon>
-            </Tooltip>
-            <Tooltip title={t('navbar.expand')} mouseEnterDelay={0.8}>
-              <NavbarIcon onClick={handleNarrowModeToggle}>
-                <i className="iconfont icon-icon-adaptive-width"></i>
-              </NavbarIcon>
-            </Tooltip>
+            <ControlButtons IconComponent={NavbarIcon} />
             <WindowControls />
           </div>
         )}