diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index 25cc21c4..b17ab9d8 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -14,6 +14,7 @@ import InputPrompt from './components/InputPrompt.js';
 import Footer from './components/Footer.js';
 import { StreamingState } from '../core/gemini-stream.js';
 import { PartListUnion } from '@google/genai';
+import ITermDetectionWarning from './utils/itermDetection.js';
 import {
   useStartupWarnings,
   useInitializationErrorEffect,
@@ -133,6 +134,7 @@ const App = ({ directory }: AppProps) => {
       )}
 
       <Footer queryLength={query.length} />
+      <ITermDetectionWarning />
     </Box>
   );
 };
diff --git a/packages/cli/src/ui/utils/itermDetection.tsx b/packages/cli/src/ui/utils/itermDetection.tsx
new file mode 100644
index 00000000..9a847724
--- /dev/null
+++ b/packages/cli/src/ui/utils/itermDetection.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { Box, Text } from 'ink';
+
+const ITermDetectionWarning: React.FC = () => {
+  if (process.env.TERM_PROGRAM !== 'iTerm.app') {
+    return null; // Don't render anything if not in iTerm
+  }
+
+  return (
+    <Box marginTop={1}>
+      <Text dimColor>Note: Flickering may occur in iTerm.</Text>
+    </Box>
+  );
+};
+
+export default ITermDetectionWarning;