diff --git a/ghost/admin/app/templates/components/power-select-vertical-collection-options.hbs b/ghost/admin/app/templates/components/power-select-vertical-collection-options.hbs
index 58c1006d16..af40e61c07 100644
--- a/ghost/admin/app/templates/components/power-select-vertical-collection-options.hbs
+++ b/ghost/admin/app/templates/components/power-select-vertical-collection-options.hbs
@@ -4,7 +4,7 @@
     {{/if}}
 {{/if}}
 
-{{#vertical-collection options minHeight=30 staticHeight=true bufferSize=10 as |opt index|}}
+{{#vertical-collection options minHeight=30 estimateHeight=6 bufferSize=10 as |opt index|}}
     <li class="ember-power-select-option"
         aria-selected="{{ember-power-select-is-selected opt select.selected}}"
         aria-disabled={{ember-power-select-true-string-if-present opt.disabled}}
diff --git a/ghost/admin/app/templates/settings/tags.hbs b/ghost/admin/app/templates/settings/tags.hbs
index de88e5e595..ccbd6290c3 100644
--- a/ghost/admin/app/templates/settings/tags.hbs
+++ b/ghost/admin/app/templates/settings/tags.hbs
@@ -10,8 +10,8 @@
         <div class="tag-list">
             <section class="tag-list-content settings-tags {{if tagListFocused 'keyboard-focused'}}">
                 {{#vertical-collection sortedTags
+                    estimateHeight=16
                     minHeight=67
-                    staticHeight=true
                     bufferSize=5
                     containerSelector=".tag-list"
                     as |tag|
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 9390e050b8..d192bb7fd7 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -26,7 +26,7 @@
     "node": ">= 4"
   },
   "devDependencies": {
-    "@html-next/vertical-collection": "1.0.0-beta.4",
+    "@html-next/vertical-collection": "1.0.0-beta.8",
     "autoprefixer": "7.1.6",
     "blueimp-md5": "2.10.0",
     "bower": "1.8.2",
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index 8baea638bf..7e04e0b233 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -85,19 +85,18 @@
   dependencies:
     "@glimmer/util" "^0.25.4"
 
-"@html-next/vertical-collection@1.0.0-beta.4":
-  version "1.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@html-next/vertical-collection/-/vertical-collection-1.0.0-beta.4.tgz#f159020a1b1a6e48b5a271d61e2e0ab2d91927cc"
+"@html-next/vertical-collection@1.0.0-beta.8":
+  version "1.0.0-beta.8"
+  resolved "https://registry.yarnpkg.com/@html-next/vertical-collection/-/vertical-collection-1.0.0-beta.8.tgz#297e25c07f84aab040e5f25a901318306c9269ab"
   dependencies:
-    babel-plugin-filter-imports "^0.3.1"
     babel-plugin-transform-es2015-block-scoping "^6.24.1"
     babel6-plugin-strip-class-callcheck "^6.0.0"
     broccoli-funnel "^1.2.0"
     broccoli-merge-trees "^2.0.0"
     broccoli-rollup "^1.2.0"
-    chalk "^1.1.3"
     ember-cli-babel "^6.0.0-beta.10"
     ember-cli-htmlbars "^1.1.1"
+    ember-compatibility-helpers "^0.1.0"
 
 JSONStream@^1.0.3:
   version "1.3.1"
@@ -3497,6 +3496,14 @@ ember-cli@2.16.2:
     walk-sync "^0.3.0"
     yam "0.0.22"
 
+ember-compatibility-helpers@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-0.1.2.tgz#8eb1769ad761db273fd40242b1170d9f3841d0f0"
+  dependencies:
+    babel-plugin-debug-macros "^0.1.11"
+    ember-cli-version-checker "^2.0.0"
+    semver "^5.4.1"
+
 ember-component-inbound-actions@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ember-component-inbound-actions/-/ember-component-inbound-actions-1.0.1.tgz#9b354803c2d729f2d072999cc89ded69762e1dad"
@@ -8494,7 +8501,7 @@ sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0, semver@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"