diff --git a/components/tracks/Track.tsx b/components/tracks/Track.tsx
index b27302a..30e5958 100644
--- a/components/tracks/Track.tsx
+++ b/components/tracks/Track.tsx
@@ -830,10 +830,9 @@ export function Track({
     return (
       <div
         className={cn(
-          "relative bg-waveform-bg border-b transition-all duration-200",
+          "relative bg-waveform-bg border-b transition-all duration-200 h-full",
           isSelected && "bg-primary/5",
         )}
-        style={{ height: trackHeight }}
       >
         {/* Inner container with dynamic width */}
         <div
diff --git a/components/tracks/TrackList.tsx b/components/tracks/TrackList.tsx
index dab28cc..96d55aa 100644
--- a/components/tracks/TrackList.tsx
+++ b/components/tracks/TrackList.tsx
@@ -208,13 +208,13 @@ export function TrackList({
               <React.Fragment key={track.id}>
                 {/* Track Waveform Row with bars stacked below - Fixed height container */}
                 <div
-                  className="flex flex-col overflow-hidden"
+                  className="flex flex-col"
                   style={{
                     height: track.collapsed ? '48px' : `${track.height || 240}px`
                   }}
                 >
                   {/* Waveform - Takes remaining space */}
-                  <div className="flex-1 min-h-0">
+                  <div className="flex-1 min-h-0 relative">
                     <Track
                     track={track}
                     zoom={zoom}