diff --git a/packages/ui/src/components/mcp/McpDropdown.tsx b/packages/ui/src/components/mcp/McpDropdown.tsx
index 72b81970..1932c846 100644
--- a/packages/ui/src/components/mcp/McpDropdown.tsx
+++ b/packages/ui/src/components/mcp/McpDropdown.tsx
@@ -188,7 +188,7 @@ export const McpDropdown: React.FC<McpDropdownProps> = ({ headerIconButtonClass
 
       {sortedNames.length === 0 && (
         <div className="px-2 py-3 typography-ui-label text-muted-foreground text-center">
-          Configure MCP servers in settings.
+          Configure MCP servers in Opencode config.
         </div>
       )}
     </>
diff --git a/packages/ui/src/components/session/SessionSidebar.tsx b/packages/ui/src/components/session/SessionSidebar.tsx
index 3c5649b3..41c82f97 100644
--- a/packages/ui/src/components/session/SessionSidebar.tsx
+++ b/packages/ui/src/components/session/SessionSidebar.tsx
@@ -139,6 +139,7 @@ interface SortableProjectItemProps {
   onClose: () => void;
   sentinelRef: (el: HTMLDivElement | null) => void;
   children?: React.ReactNode;
+  settingsAutoCreateWorktree: boolean;
 }
 
 const SortableProjectItem: React.FC<SortableProjectItemProps> = ({
@@ -161,6 +162,7 @@ const SortableProjectItem: React.FC<SortableProjectItemProps> = ({
   onClose,
   sentinelRef,
   children,
+  settingsAutoCreateWorktree,
 }) => {
   const {
     attributes,
@@ -255,7 +257,7 @@ const SortableProjectItem: React.FC<SortableProjectItemProps> = ({
             </DropdownMenuContent>
           </DropdownMenu>
 
-          {isRepo && onNewWorktreeSession && (
+          {isRepo && onNewWorktreeSession && !settingsAutoCreateWorktree && (
             <Tooltip>
               <TooltipTrigger asChild>
                 <button
@@ -1598,6 +1600,7 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({
                     }}
                     onClose={() => removeProject(projectKey)}
                     sentinelRef={(el) => { projectHeaderSentinelRefs.current.set(projectKey, el); }}
+                    settingsAutoCreateWorktree={settingsAutoCreateWorktree}
                   >
                     {!isCollapsed ? (
                       <div className="space-y-[0.6rem] py-1 pl-1">