diff --git a/crates/device/src/arranger/arranger_view.rs b/crates/device/src/arranger/arranger_view.rs
index ed74c752..47a1a64e 100644
--- a/crates/device/src/arranger/arranger_view.rs
+++ b/crates/device/src/arranger/arranger_view.rs
@@ -425,7 +425,13 @@ pub trait ClipsView: TracksView + ScenesView + Send + Sync {
             {
                 //column(&Fixed::x(5, Fill::xy(Tui::bg(Green, "kyp"))));
                 column(&Fixed::x(
-                    track.width as u16,
+                    if self.selection().track() == Some(track_index)
+                        && let Some(editor) = self.editor ()
+                    {
+                        editor.width().max(24).max(track.width)
+                    } else {
+                        track.width
+                    } as u16,
                     Fill::y(self.view_track_clips(track_index, track))
                 ))
             }
@@ -457,14 +463,20 @@ pub trait ClipsView: TracksView + ScenesView + Send + Sync {
                     theme.dark.rgb
                 };
                 cell(&Fixed::xy(
-                    track.width as u16,
+                    if self.selection().track() == Some(track_index)
+                        && let Some(editor) = self.editor ()
+                    {
+                        editor.width().max(24).max(track.width)
+                    } else {
+                        track.width
+                    } as u16,
                     if self.selection().scene() == Some(scene_index)
                         && let Some(editor) = self.editor ()
                     {
-                        (editor.height() as u16).max(12)
+                        editor.height().max(12)
                     } else {
-                        Self::H_SCENE as u16
-                    },
+                        Self::H_SCENE
+                    } as u16,
                     Bsp::b(
                         Fill::xy(Outer(true, Style::default().fg(outline))),
                         Fill::xy(Align::nw(Tui::fg_bg(fg, bg, Align::nw(name.unwrap_or(" ---- ".into())))))