diff --git a/src/components/piano-roll/PianoRoll.css b/src/components/piano-roll/PianoRoll.css
index 5cb6bcd..e220217 100644
--- a/src/components/piano-roll/PianoRoll.css
+++ b/src/components/piano-roll/PianoRoll.css
@@ -311,6 +311,7 @@
 
 .piano-roll-title {
   flex: 1;
+  min-width: 0;
   text-align: center;
   font-size: 12px;
   font-weight: bold;
@@ -319,6 +320,9 @@
   cursor: text;
   padding: 5px;
   border-radius: 3px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .piano-roll-title-input {
diff --git a/src/components/track/Track.css b/src/components/track/Track.css
index a17e470..47a946c 100644
--- a/src/components/track/Track.css
+++ b/src/components/track/Track.css
@@ -94,10 +94,12 @@
 /* Remove drag indicator since hover cursor is sufficient */
 
 .track-name {
-  display: flex;
-  align-items: center;
+  display: block;
   min-height: 24px;
+  width: 100%;
+  min-width: 0;
   font-size: 12px;
+  line-height: 24px;
   cursor: text;
   overflow: hidden;
   text-overflow: ellipsis;