diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 17821bc5..83b39255 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,16 +9,18 @@
       <%= yield %>
     </main>
   <% else %>
-    <div class='o-flex u-vw-100 u-vh-100'>
-      <aside id='js-sidebar' class='o-flex__item o-flex__item--shrink-0 o-flex o-flex--column-reverse c-sidebar' data-turbo-permanent>
-        <div class='o-flex__item o-flex__item--shrink-0'>
-          <%= render 'shared/player' %>
-        </div>
-        <div class='o-flex__item o-flex__item--grow-1 u-h-0'>
-          <%= turbo_frame_tag 'turbo-playlist', src: current_playlist_songs_path(init: true), class: 'u-h-100 o-flex o-flex--column' %>
+    <div class='o-flex'>
+      <aside id='js-sidebar' class='o-flex__item o-flex__item--shrink-0 c-sidebar' data-turbo-permanent>
+        <div class='o-flex o-flex--column-reverse u-position-sticky-top u-overflow-auto u-vh-100'>
+          <div class='o-flex__item o-flex__item--shrink-0'>
+            <%= render 'shared/player' %>
+          </div>
+          <div class='o-flex__item o-flex__item--grow-1 u-h-0'>
+            <%= turbo_frame_tag 'turbo-playlist', src: current_playlist_songs_path(init: true), class: 'u-h-100 o-flex o-flex--column' %>
+          </div>
         </div>
       </aside>
-      <div class='o-flex__item o-flex__item--grow-1 u-overflow-auto' data-test-id='main_content'>
+      <div class='o-flex__item o-flex__item--grow-1' >
         <div>
           <header class='c-nav c-nav--primary u-position-sticky-top'>
             <div id='turbo-flash' class='c-flash'>
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index ddeed282..2424d4ab 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -10,7 +10,7 @@
     <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
   </head>
 
-  <body class="<%= 'u-overflow-hidden' unless turbo_native? %>">
+  <body>
     <%= content_for?(:body) ? yield(:body) : yield %>
     <%= render 'shared/icons' %>
   </body>
diff --git a/test/system/albums_test.rb b/test/system/albums_test.rb
index 36517a0b..a6e015be 100644
--- a/test/system/albums_test.rb
+++ b/test/system/albums_test.rb
@@ -20,7 +20,7 @@ class AlbumsSystemTest < ApplicationSystemTestCase
 
   test "show next page albums when scroll to the bottom" do
     visit albums_url
-    find(:test_id, "main_content").scroll_to :bottom
+    scroll_to :bottom
 
     assert_selector(:test_id, "album_card", count: Pagy::DEFAULT[:items] * 2)
   end
diff --git a/test/system/artists_test.rb b/test/system/artists_test.rb
index 228ac5a5..4c1d8df1 100644
--- a/test/system/artists_test.rb
+++ b/test/system/artists_test.rb
@@ -20,7 +20,7 @@ class ArtistsSystemTest < ApplicationSystemTestCase
 
   test "show next page artists when scroll to the bottom" do
     visit artists_url
-    find(:test_id, "main_content").scroll_to :bottom
+    scroll_to :bottom
 
     assert_selector(:test_id, "artist_card", count: Pagy::DEFAULT[:items] * 2)
   end
diff --git a/test/system/songs_test.rb b/test/system/songs_test.rb
index 996677f1..c828b142 100644
--- a/test/system/songs_test.rb
+++ b/test/system/songs_test.rb
@@ -27,7 +27,7 @@ class SongsSystemTest < ApplicationSystemTestCase
 
   test "show next page songs when scroll to the bottom" do
     visit songs_url
-    find(:test_id, "main_content").scroll_to :bottom
+    scroll_to :bottom
 
     assert_selector(:test_id, "song_item", count: Pagy::DEFAULT[:items] * 2)
   end
