diff --git a/ChangeLog b/ChangeLog
index 7cce2905e..e29118619 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
 	* src/gui/cusis_style.cpp:
 	Add per-TCO coloring and non-linear motion when dragging
 
+	* src/gui/classic_style.cpp:
+	Fix text clipping
+
 2009-02-19	Paul Giblock <drfaygo/at/gmail/dot/com>
 	
 	* include/track.h:
diff --git a/src/gui/classic_style.cpp b/src/gui/classic_style.cpp
index 43809a6de..ab019859a 100644
--- a/src/gui/classic_style.cpp
+++ b/src/gui/classic_style.cpp
@@ -449,10 +449,10 @@ void ClassicStyle::drawTrackContentObject( QPainter * _painter,
 						rc.height() - 2 * TCO_BORDER_WIDTH );
 			}
 
+			p->setClipRect( rc.adjusted( 1, 1, -1, -1 ) );
 			if( pat->type() == pattern::MelodyPattern )
 			{
 				int central_key = 0;
-				p->setClipRect( rc.adjusted( 1, 1, -1, -1 ) );
 				if( pat->notes().size() > 0 )
 				{
 					// first determine the central tone so that we can
@@ -516,7 +516,6 @@ void ClassicStyle::drawTrackContentObject( QPainter * _painter,
 						p->setRenderHint( QPainter::Antialiasing, true );
 					}
 				}
-				p->setClipping( false );
 			}
 			/*
 			else if( pat->type() == pattern::BeatPattern &&
@@ -613,6 +612,7 @@ void ClassicStyle::drawTrackContentObject( QPainter * _painter,
 				*/
 			}
 
+			p->setClipping( false );
 		}
 	}
 }