diff --git a/js/components/PlaylistWindow/__snapshots__/index.test.js.snap b/js/components/PlaylistWindow/__snapshots__/index.test.js.snap
index a6c35d13..e4cadf37 100644
--- a/js/components/PlaylistWindow/__snapshots__/index.test.js.snap
+++ b/js/components/PlaylistWindow/__snapshots__/index.test.js.snap
@@ -40,13 +40,7 @@ exports[`PlaylistWindow renders to snapshot 1`] = `
       <div
         className="playlist-tracks"
       >
-        <div
-          style={
-            Object {
-              "marginTop": "-0px",
-            }
-          }
-        >
+        <div>
           <div
             className="playlist-track selected"
             onClick={[Function]}
@@ -167,96 +161,6 @@ exports[`PlaylistWindow renders to snapshot 1`] = `
               03:11
             </div>
           </div>
-          <div
-            className="playlist-track"
-            onClick={[Function]}
-            onContextMenu={[Function]}
-            style={
-              Object {
-                "backgroundColor": null,
-                "color": null,
-              }
-            }
-          >
-            <div
-              className="playlist-track-number"
-            >
-              5
-              .
-            </div>
-            <div
-              className="playlist-track-title"
-            >
-              <span>
-                Dragula
-              </span>
-            </div>
-            <div
-              className="playlist-track-duration"
-            >
-              03:11
-            </div>
-          </div>
-          <div
-            className="playlist-track"
-            onClick={[Function]}
-            onContextMenu={[Function]}
-            style={
-              Object {
-                "backgroundColor": null,
-                "color": null,
-              }
-            }
-          >
-            <div
-              className="playlist-track-number"
-            >
-              6
-              .
-            </div>
-            <div
-              className="playlist-track-title"
-            >
-              <span>
-                Ultrasonic Sound
-              </span>
-            </div>
-            <div
-              className="playlist-track-duration"
-            >
-              03:11
-            </div>
-          </div>
-          <div
-            className="playlist-track"
-            onClick={[Function]}
-            onContextMenu={[Function]}
-            style={
-              Object {
-                "backgroundColor": null,
-                "color": null,
-              }
-            }
-          >
-            <div
-              className="playlist-track-number"
-            >
-              7
-              .
-            </div>
-            <div
-              className="playlist-track-title"
-            >
-              <span>
-                Du hast
-              </span>
-            </div>
-            <div
-              className="playlist-track-duration"
-            >
-              03:11
-            </div>
-          </div>
         </div>
       </div>
     </div>
diff --git a/js/components/PlaylistWindow/index.js b/js/components/PlaylistWindow/index.js
index ab996fad..013c6c85 100644
--- a/js/components/PlaylistWindow/index.js
+++ b/js/components/PlaylistWindow/index.js
@@ -64,6 +64,9 @@ const PlaylistWindow = props => {
     overflowTracks + 1
   );
 
+  // Ugh. By not rendering some tracks, we can end up in a situation where
+  // scrolling causes the number of digits in the tracks to go up, thus causing
+  // a horizontal jump.
   const tracks = trackOrder.slice(offset, offset + numberOfVisibleTracks);
   return (
     <div