diff --git a/package.json b/package.json
index 681d55793..266836a0a 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "react-autosize-textarea": "*",
     "react-dom": "^16.2.0",
     "react-dom-factories": "^1.0.0",
-    "react-virtual-list": "notbakaneko/react-virtual-list#094205e",
+    "react-virtual-list": "*",
     "require-dir": "^0.3.2",
     "retina.js": "^1.1.0",
     "timeago": "^1.5.0",
diff --git a/resources/assets/coffee/react/beatmaps/main.coffee b/resources/assets/coffee/react/beatmaps/main.coffee
index d5d6ec26b..591a5dbaf 100644
--- a/resources/assets/coffee/react/beatmaps/main.coffee
+++ b/resources/assets/coffee/react/beatmaps/main.coffee
@@ -30,9 +30,13 @@ ListRender = ({ virtual, itemHeight }) ->
       className: 'beatmapsets__items'
       virtual.items.map (item) ->
         div
-          className: 'beatmapsets__item'
-          key: item.id
-          el BeatmapsetPanel, beatmap: item
+          className: 'beatmapsets__items-row'
+          key: (map.id for map in item).join('-')
+          for map in item
+            div
+              className: 'beatmapsets__item'
+              key: map.id
+              el BeatmapsetPanel, beatmap: map
 
 BeatmapList = VirtualList()(ListRender)
 
@@ -107,10 +111,9 @@ class Beatmaps.Main extends React.PureComponent
             className: 'beatmapsets__content'
             if @state.beatmaps.length > 0
               el BeatmapList,
-                items: @state.beatmaps
+                items: _.chunk(@state.beatmaps, @state.columnCount)
                 itemBuffer: 5
                 itemHeight: ITEM_HEIGHT
-                columns: @state.columnCount
 
             else
               div className: 'beatmapsets__empty',
diff --git a/resources/assets/less/bem/beatmapsets.less b/resources/assets/less/bem/beatmapsets.less
index 0ee5d927a..2f2523480 100644
--- a/resources/assets/less/bem/beatmapsets.less
+++ b/resources/assets/less/bem/beatmapsets.less
@@ -52,4 +52,9 @@
     display: flex;
     flex-wrap: wrap;
   }
+
+  &__items-row {
+    display: flex;
+    width: 100%;
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index dc8b069ed..8ff99764d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5079,6 +5079,14 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types@^15.5.10:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 prop-types@^15.5.6, prop-types@^15.6.0:
   version "15.6.0"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
@@ -5216,11 +5224,11 @@ react-dom@^16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react-virtual-list@notbakaneko/react-virtual-list#094205e:
+react-virtual-list@*:
   version "2.2.4"
-  resolved "https://codeload.github.com/notbakaneko/react-virtual-list/tar.gz/094205ebcc591ab1a2fdad6c31ae7066b52f66d0"
+  resolved "https://registry.yarnpkg.com/react-virtual-list/-/react-virtual-list-2.2.4.tgz#bbeb4938436f80ddbff4f8724f43de2117085691"
   dependencies:
-    prop-types "^15.6.0"
+    prop-types "^15.5.10"
 
 react@^16.2.0:
   version "16.2.0"