diff --git a/app/w/components/sidebar/components/settings-modal/components/environment/environment.tsx b/app/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
index 06dda8479c..cdbc742862 100644
--- a/app/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
+++ b/app/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
@@ -200,6 +200,7 @@ export function EnvironmentVariables({ onOpenChange }: EnvironmentVariablesProps
         onChange={(e) => updateEnvVar(index, 'key', e.target.value)}
         onPaste={(e) => handlePaste(e, index)}
         placeholder="e.g. API_KEY"
+        autoComplete="off"
       />
       <Input
         data-input-type="value"
@@ -212,6 +213,7 @@ export function EnvironmentVariables({ onOpenChange }: EnvironmentVariablesProps
         onPaste={(e) => handlePaste(e, index)}
         placeholder="Enter value"
         className="allow-scroll"
+        autoComplete="off"
       />
       <Button variant="ghost" size="icon" onClick={() => removeEnvVar(index)} className="h-10 w-10">
         ×
diff --git a/app/w/components/toolbar/toolbar.tsx b/app/w/components/toolbar/toolbar.tsx
index 98b371f543..2ea852a4cb 100644
--- a/app/w/components/toolbar/toolbar.tsx
+++ b/app/w/components/toolbar/toolbar.tsx
@@ -56,6 +56,7 @@ export function Toolbar() {
               className="pl-9"
               value={searchQuery}
               onChange={(e) => setSearchQuery(e.target.value)}
+              autoComplete="off"
             />
           </div>
         </div>