diff --git a/Timeline/Waveform.C b/Timeline/Waveform.C
index eef0565..1b0f439 100644
--- a/Timeline/Waveform.C
+++ b/Timeline/Waveform.C
@@ -57,6 +57,8 @@ Waveform::draw ( int X, int Y, int W, int H,
     const int halfheight = H / 2;
     const int mid = Y + halfheight;
 
+    W = min( peaks, W );
+
     if ( Waveform::fill )
     {
         j = start;