diff --git a/apps/code/src/renderer/components/ui/combobox/Combobox.tsx b/apps/code/src/renderer/components/ui/combobox/Combobox.tsx
index fbbdb0358..ace83dd44 100644
--- a/apps/code/src/renderer/components/ui/combobox/Combobox.tsx
+++ b/apps/code/src/renderer/components/ui/combobox/Combobox.tsx
@@ -173,9 +173,11 @@ function ComboboxTrigger({
         style={style}
       >
         <span className="combobox-trigger-inner">{displayValue}</span>
-        <span className="combobox-trigger-icon">
-          <CaretDown weight="bold" />
-        </span>
+        {!disabled && (
+          <span className="combobox-trigger-icon">
+            <CaretDown weight="bold" />
+          </span>
+        )}
       </button>
     </Popover.Trigger>
   );
diff --git a/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx b/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
index 7203e9049..19973c11a 100644
--- a/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
+++ b/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
@@ -33,6 +33,7 @@ interface ModeAndBranchRowProps {
   } | null;
   disabled?: boolean;
   isBashMode?: boolean;
+  isCloud?: boolean;
   taskId?: string;
 }
 
@@ -44,6 +45,7 @@ function ModeAndBranchRow({
   cloudDiffStats,
   disabled,
   isBashMode,
+  isCloud,
   taskId,
 }: ModeAndBranchRowProps) {
   const { currentBranch: gitBranch, diffStats } = useGitQueries(
@@ -120,7 +122,7 @@ function ModeAndBranchRow({
             <BranchSelector
               repoPath={repoPath ?? null}
               currentBranch={currentBranch}
-              disabled={disabled}
+              disabled={disabled || isCloud}
               variant="ghost"
               taskId={taskId}
             />
@@ -362,6 +364,7 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
           cloudDiffStats={cloudDiffStats}
           disabled={disabled}
           isBashMode={isBashMode}
+          isCloud={isCloud}
           taskId={taskId}
         />
       </Flex>