diff --git a/src/components/generation/EnhancePanel.tsx b/src/components/generation/EnhancePanel.tsx
index d02a0019a..f256bb2e2 100644
--- a/src/components/generation/EnhancePanel.tsx
+++ b/src/components/generation/EnhancePanel.tsx
@@ -50,6 +50,8 @@ interface ResultEntry {
   durationSec: number;
   peaks: number[];
   timestamp: number;
+  status: 'generating' | 'ready' | 'error';
+  error?: string;
 }
 
 type ABSide = 'A' | 'B';
@@ -160,6 +162,9 @@ export function EnhancePanel() {
   // Quick Styles section
   const [quickStylesOpen, setQuickStylesOpen] = useState(false);
 
+  // Local guard against rapid Generate clicks (supplements store-level isGenerating)
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
   // Playback
   const playback = useEnhancePlayback();
 
@@ -331,17 +336,27 @@ export function EnhancePanel() {
         }
       }
     }
-    if (!audioKey) return;
+    if (!audioKey) {
+      setResults((prev) => prev.map((r) =>
+        r.id === resultId ? { ...r, status: 'error' as const, error: 'No audio key found for result' } : r,
+      ));
+      return;
+    }
 
     try {
       const buffer = await playback.loadBuffer(audioKey);
-      if (!buffer) return;
+      if (!buffer) {
+        setResults((prev) => prev.map((r) =>
+          r.id === resultId ? { ...r, status: 'error' as const, error: 'Failed to load audio buffer' } : r,
+        ));
+        return;
+      }
       const peaks = computeWaveformPeaks(buffer, 60);
       const dur = buffer.duration;
       const finalClipId = updatedClip?.id ?? originalClipId;
       setResults((prev) => prev.map((r) =>
         r.id === resultId
-          ? { ...r, clipId: finalClipId, audioKey, peaks, duration: formatDuration(dur), durationSec: dur }
+          ? { ...r, clipId: finalClipId, audioKey, peaks, duration: formatDuration(dur), durationSec: dur, status: 'ready' as const }
           : r,
       ));
       // Auto-select first result
@@ -350,14 +365,18 @@ export function EnhancePanel() {
         if (prev === 0) return Math.max(0, results.length); // point to new entry
         return prev;
       });
-    } catch {
-      // Audio decode failed — leave duration as --:--
+    } catch (err) {
+      const message = err instanceof Error ? err.message : 'Audio decode failed';
+      setResults((prev) => prev.map((r) =>
+        r.id === resultId ? { ...r, status: 'error' as const, error: message } : r,
+      ));
     }
   }, [playback, results.length, enhancerTarget]);
 
   // Cover generation
   const handleCoverGenerate = useCallback(async () => {
-    if (!enhancerTarget || isGenerating) return;
+    if (!enhancerTarget || isGenerating || isSubmitting) return;
+    setIsSubmitting(true);
     const coverStrength = CONSISTENCY_VALUES[consistency];
     const resultId = `result-${Date.now()}`;
     setResults((prev) => [...prev, {
@@ -369,22 +388,33 @@ export function EnhancePanel() {
       durationSec: 0,
       peaks: [],
       timestamp: Date.now(),
+      status: 'generating',
     }]);
-    const newClipId = await generateCoverClip({
-      clipId: enhancerTarget.clipId,
-      caption,
-      lyrics,
-      coverStrength,
-      createNew,
-      sourceAudioOverride: chainedSourceAudioKey || undefined,
-    });
-    // After generation, try to load the result audio to get peaks/duration
-    await finalizeResult(resultId, enhancerTarget.clipId, newClipId);
-  }, [enhancerTarget, caption, lyrics, consistency, createNew, isGenerating, chainedSourceAudioKey, finalizeResult]);
+    try {
+      const newClipId = await generateCoverClip({
+        clipId: enhancerTarget.clipId,
+        caption,
+        lyrics,
+        coverStrength,
+        createNew,
+        sourceAudioOverride: chainedSourceAudioKey || undefined,
+      });
+      // After generation, try to load the result audio to get peaks/duration
+      await finalizeResult(resultId, enhancerTarget.clipId, newClipId);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : 'Enhancement failed';
+      setResults((prev) => prev.map((r) =>
+        r.id === resultId ? { ...r, status: 'error' as const, error: message } : r,
+      ));
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, [enhancerTarget, caption, lyrics, consistency, createNew, isGenerating, isSubmitting, chainedSourceAudioKey, finalizeResult]);
 
   // Repaint generation
   const handleRepaintGenerate = useCallback(async () => {
-    if (!enhancerTarget || isGenerating) return;
+    if (!enhancerTarget || isGenerating || isSubmitting) return;
+    setIsSubmitting(true);
     const resultId = `result-${Date.now()}`;
     setResults((prev) => [...prev, {
       id: resultId,
@@ -395,19 +425,29 @@ export function EnhancePanel() {
       durationSec: 0,
       peaks: [],
       timestamp: Date.now(),
+      status: 'generating',
     }]);
-    const newClipId = await generateRepaintClip({
-      clipId: enhancerTarget.clipId,
-      repaintStart: selStart,
-      repaintEnd: selEnd,
-      prompt,
-      globalCaption: globalCaption || undefined,
-      repaintMode,
-      repaintStrength,
-      sourceAudioOverride: chainedSourceAudioKey || undefined,
-    });
-    await finalizeResult(resultId, enhancerTarget.clipId, newClipId);
-  }, [enhancerTarget, selStart, selEnd, prompt, globalCaption, repaintMode, repaintStrength, isGenerating, chainedSourceAudioKey, finalizeResult]);
+    try {
+      const newClipId = await generateRepaintClip({
+        clipId: enhancerTarget.clipId,
+        repaintStart: selStart,
+        repaintEnd: selEnd,
+        prompt,
+        globalCaption: globalCaption || undefined,
+        repaintMode,
+        repaintStrength,
+        sourceAudioOverride: chainedSourceAudioKey || undefined,
+      });
+      await finalizeResult(resultId, enhancerTarget.clipId, newClipId);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : 'Repaint failed';
+      setResults((prev) => prev.map((r) =>
+        r.id === resultId ? { ...r, status: 'error' as const, error: message } : r,
+      ));
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, [enhancerTarget, selStart, selEnd, prompt, globalCaption, repaintMode, repaintStrength, isGenerating, isSubmitting, chainedSourceAudioKey, finalizeResult]);
 
   const handleGenerate = mode === 'cover' ? handleCoverGenerate : handleRepaintGenerate;
 
@@ -560,7 +600,7 @@ export function EnhancePanel() {
   const coverSupported = modelSupportsTaskType('cover');
   const repaintSupported = modelSupportsTaskType('repaint');
   const modeSupported = mode === 'cover' ? coverSupported : repaintSupported;
-  const canGenerate = hasAudio && modeSupported && !isGenerating && !!(clip && track);
+  const canGenerate = hasAudio && modeSupported && !isGenerating && !isSubmitting && !!(clip && track);
 
   const clipStart = clip?.startTime ?? 0;
   const clipEnd = (clip?.startTime ?? 0) + (clip?.duration ?? 0);
@@ -1055,7 +1095,7 @@ export function EnhancePanel() {
                 : 'bg-[#2a2a2e] text-zinc-500 cursor-not-allowed'
             }`}
           >
-            {isGenerating
+            {isGenerating || isSubmitting
               ? (mode === 'cover' ? 'Enhancing...' : 'Repainting...')
               : (mode === 'cover' ? 'Enhance' : 'Repaint Selection')
             }
@@ -1094,6 +1134,15 @@ export function EnhancePanel() {
                   }`}
                 >
                   <div className="flex items-center gap-2 px-2 py-2">
+                    {r.status === 'generating' ? (
+                      <div className="w-6 h-6 flex items-center justify-center flex-shrink-0">
+                        <div className="w-4 h-4 border-2 border-zinc-600 border-t-teal-400 rounded-full animate-spin" />
+                      </div>
+                    ) : r.status === 'error' ? (
+                      <div className="w-6 h-6 flex items-center justify-center rounded-full bg-red-900/50 text-red-400 flex-shrink-0">
+                        <svg className="w-3 h-3" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5"><path d="M18 6L6 18M6 6l12 12" strokeLinecap="round" /></svg>
+                      </div>
+                    ) : (
                     <button
                       data-testid={`result-play-btn-${idx}`}
                       onClick={(e) => { e.stopPropagation(); handleResultPlay(r.id, r.audioKey); }}
@@ -1110,14 +1159,17 @@ export function EnhancePanel() {
                         <svg className="w-3 h-3" viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z" /></svg>
                       )}
                     </button>
+                    )}
                     <div className="flex-1 min-w-0">
-                      <p className="text-[11px] text-zinc-300 truncate">
+                      <p className={`text-[11px] truncate ${r.status === 'error' ? 'text-red-400' : 'text-zinc-300'}`}>
                         {r.title}
                         {canAB && isSelected && (
                           <span className={`ml-1 ${abSide === 'B' ? 'text-violet-400 font-bold' : 'text-zinc-600'}`}>B</span>
                         )}
                       </p>
-                      <p className="text-[10px] text-zinc-600">{r.duration}</p>
+                      <p className="text-[10px] text-zinc-600">
+                        {r.status === 'generating' ? 'Generating...' : r.status === 'error' ? (r.error ?? 'Failed') : r.duration}
+                      </p>
                     </div>
                     {r.audioKey && (
                       <button
diff --git a/src/components/generation/__tests__/EnhancePanel.test.tsx b/src/components/generation/__tests__/EnhancePanel.test.tsx
index e2d452c91..7b9de7876 100644
--- a/src/components/generation/__tests__/EnhancePanel.test.tsx
+++ b/src/components/generation/__tests__/EnhancePanel.test.tsx
@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { EnhancePanel } from '../EnhancePanel';
 import { useProjectStore } from '../../../store/projectStore';
 import { useUIStore } from '../../../store/uiStore';
@@ -8,6 +8,7 @@ import { ENHANCE_PRESETS } from '../../../constants/enhancePresets';
 
 const mockGenerateCoverClip = vi.fn().mockResolvedValue(undefined);
 const mockGenerateRepaintClip = vi.fn().mockResolvedValue(undefined);
+
 vi.mock('../../../services/generationPipeline', () => ({
   generateCoverClip: (...args: unknown[]) => mockGenerateCoverClip(...args),
   generateRepaintClip: (...args: unknown[]) => mockGenerateRepaintClip(...args),
@@ -791,3 +792,62 @@ describe('EnhancePanel generation calls', () => {
     expect(await mockGenerateCoverClip.mock.results[0].value).toBe(expectedNewClipId);
   });
 });
+
+describe('EnhancePanel result entry states', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    useGenerationStore.setState({ isGenerating: false });
+    mockGenerateCoverClip.mockReset().mockResolvedValue(undefined);
+  });
+
+  function renderCoverPanelAndClickGenerate() {
+    const { track, clip } = setupProjectWithClip();
+    useUIStore.setState({
+      enhancerOpen: true,
+      enhancerTarget: { clipId: clip.id, trackId: track.id, range: null, mode: 'cover' },
+    });
+    const result = render(<EnhancePanel />);
+    // Click Generate — it creates a result entry with status 'generating'
+    fireEvent.click(screen.getByTestId('enhance-btn'));
+    return { result, track, clip };
+  }
+
+  it('shows a spinner when result status is generating', async () => {
+    // Make generateCoverClip hang so finalizeResult never runs
+    mockGenerateCoverClip.mockReturnValue(new Promise(() => {}));
+    renderCoverPanelAndClickGenerate();
+
+    await waitFor(() => {
+      const resultItem = screen.getByTestId('result-item-0');
+      // The spinner is a div with animate-spin class
+      const spinner = resultItem.querySelector('.animate-spin');
+      expect(spinner).not.toBeNull();
+    });
+    // Also verify the "Generating..." text
+    expect(screen.getByText('Generating...')).toBeInTheDocument();
+  });
+
+  it('shows an error icon and message when result status is error', async () => {
+    mockGenerateCoverClip.mockRejectedValue(new Error('Server timeout'));
+    renderCoverPanelAndClickGenerate();
+
+    await waitFor(() => {
+      expect(screen.getByText('Server timeout')).toBeInTheDocument();
+    });
+    // The error icon container should have red styling
+    const resultItem = screen.getByTestId('result-item-0');
+    const errorIcon = resultItem.querySelector('.bg-red-900\\/50');
+    expect(errorIcon).not.toBeNull();
+  });
+
+  it('displays the specific error message text from a failed generation', async () => {
+    mockGenerateCoverClip.mockRejectedValue(new Error('Model capacity exceeded'));
+    renderCoverPanelAndClickGenerate();
+
+    await waitFor(() => {
+      const errorText = screen.getByText('Model capacity exceeded');
+      expect(errorText).toBeInTheDocument();
+      expect(errorText.textContent).toBe('Model capacity exceeded');
+    });
+  });
+});