2 files changed, 7 insertions, 6 deletions
diff --git a/src/client/views/nodes/AudioBox.tsx b/src/client/views/nodes/AudioBox.tsx
index 918933194..f6d6ff440 100644
--- a/src/client/views/nodes/AudioBox.tsx
+++ b/src/client/views/nodes/AudioBox.tsx
@@ -546,6 +546,7 @@ export class AudioBox extends ViewBoxAnnotatableComponent<
     timelineWidth = () => this.props.PanelWidth() - AudioBox.playheadWidth;
     trimEndFunc = () => this.trimEnd;
     trimStartFunc = () => this.trimStart;
+    trimDurationFunc = () => this.trimDuration;
     @computed get renderTimeline() {
         return (
             <CollectionStackedTimeline
@@ -560,8 +561,6 @@ export class AudioBox extends ViewBoxAnnotatableComponent<
                 focus={DocUtils.DefaultFocus}
                 bringToFront={emptyFunction}
                 CollectionView={undefined}
-                rawDuration={this.rawDuration}
-                duration={this.duration}
                 playFrom={this.playFrom}
                 setTime={this.setAnchorTime}
                 playing={this.playing}
@@ -577,12 +576,14 @@ export class AudioBox extends ViewBoxAnnotatableComponent<
                 playLink={this.playLink}
                 PanelWidth={this.timelineWidth}
                 PanelHeight={this.timelineHeight}
+                rawDuration={this.rawDuration}
                 clipStart={this.clipStart}
                 clipEnd={this.clipEnd}
+                clipDuration={this.duration}
                 trimming={this._trimming}
                 trimStart={this.trimStartFunc}
                 trimEnd={this.trimEndFunc}
-                trimDuration={this.trimDuration}
+                trimDuration={this.trimDurationFunc}
                 setStartTrim={this.setStartTrim}
                 setEndTrim={this.setEndTrim}
             />
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index 2485e7658..8b33842ff 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -538,8 +538,6 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
                 endTag={"_timecodeToHide" /* videoEnd */}
                 bringToFront={emptyFunction}
                 CollectionView={undefined}
-                duration={this.duration}
-                rawDuration={this.duration}
                 playFrom={this.playFrom}
                 setTime={this.setAnchorTime}
                 playing={this.playing}
@@ -551,12 +549,14 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
                 Pause={this.Pause}
                 playLink={this.playLink}
                 PanelHeight={this.timelineHeight}
+                rawDuration={this.duration}
+                clipDuration={this.duration}
                 clipStart={0}
                 clipEnd={this.duration}
                 trimming={false}
                 trimStart={returnZero}
                 trimEnd={this.trimEndFunc}
-                trimDuration={this.duration}
+                trimDuration={this.trimEndFunc}
                 setStartTrim={emptyFunction}
                 setEndTrim={emptyFunction}
             />