diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 7653e0383..c43211645 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -4164,7 +4164,7 @@ bool TrackPanel::IsDragZooming()
 /// Determines if the a modal tool is active
 bool TrackPanel::IsMouseCaptured()
 {
-   return (mMouseCapture != IsUncaptured);
+   return (mMouseCapture != IsUncaptured || mCapturedTrack != NULL);
 }