diff --git a/components/tracks/Track.tsx b/components/tracks/Track.tsx
index c19d3d2..8aa0670 100644
--- a/components/tracks/Track.tsx
+++ b/components/tracks/Track.tsx
@@ -604,7 +604,7 @@ export function Track({
       )}
     >
       {/* Top: Track Row (Control Panel + Waveform) */}
-      <div className="flex" style={{ height: trackHeight }}>
+      <div className="flex overflow-hidden" style={{ height: trackHeight }}>
         {/* Left: Track Control Panel (Fixed Width) - Ableton Style */}
         <div
           className={cn(
@@ -723,13 +723,15 @@ export function Track({
           )}
         </div>
 
-      {/* Right: Waveform Area (Flexible Width) */}
-      <div
-        className="flex-1 relative bg-waveform-bg border-b border-l border-border"
-        style={{
-          minWidth: track.audioBuffer ? `${duration * zoom * 100}px` : undefined
-        }}
-      >
+      {/* Right: Waveform Area (Flexible Width) - Scrollable */}
+      <div className="flex-1 relative bg-waveform-bg border-b border-l border-border overflow-x-auto custom-scrollbar">
+        {/* Inner container with dynamic width */}
+        <div
+          className="relative h-full"
+          style={{
+            minWidth: track.audioBuffer ? `${duration * zoom * 100}px` : '100%'
+          }}
+        >
         {/* Delete Button - Top Right Overlay */}
         <button
           onClick={(e) => {
@@ -788,8 +790,9 @@ export function Track({
             </>
           )
         )}
-      </div>
-      </div>
+        </div> {/* Close inner container with minWidth */}
+      </div> {/* Close waveform scrollable area */}
+      </div> {/* Close track row */}
 
       {/* Automation Lane */}
       {!track.collapsed && track.automation?.showAutomation && (() => {