diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index 89a8d485f0d..50e938439b2 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -9,7 +9,6 @@ export default ComboBoxComponent.extend({
   classNameBindings: ["categoryStyle"],
   classNames: "category-drop",
   verticalOffset: 3,
-  collectionHeight: "200",
   content: Ember.computed.alias("categories"),
   rowComponent: "category-row",
   headerComponent: "category-drop/category-drop-header",
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
index d8b3a2be475..6eb218d45bd 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
@@ -7,7 +7,6 @@ export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["composer-actions"],
   classNames: "composer-actions",
   fullWidthOnMobile: true,
-  collectionHeight: "auto",
   autofilterable: false,
   filterable: false,
   allowInitialValueMutation: false,
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
index eaa9c6780f3..1c91d22a8ec 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
@@ -8,7 +8,6 @@ export default DropdownSelectBoxComponent.extend({
   nameProperty: "key",
   fullWidthOnMobile: true,
   content: allLevels,
-  collectionHeight: "auto",
   castInteger: true,
   autofilterable: false,
   filterable: false,
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
index 02bb13c9075..939bdedd949 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
@@ -4,7 +4,6 @@ export default DropdownSelectBoxComponent.extend({
   classNames: ["period-chooser"],
   rowComponent: "period-chooser/period-chooser-row",
   headerComponent: "period-chooser/period-chooser-header",
-  collectionHeight: "auto",
   content: Ember.computed.alias("site.periods"),
   value: Ember.computed.alias("period"),
   isHidden: Ember.computed.alias("showPeriods"),
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index e08b74e32f8..732af67d8f0 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -54,7 +54,6 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   headerComputedContent: null,
   collectionHeaderComputedContent: null,
   collectionComponent: "select-kit/select-kit-collection",
-  collectionHeight: 200,
   verticalOffset: 0,
   horizontalOffset: 0,
   fullWidthOnMobile: false,
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
index 1ebcd1e9bae..a91a6ae7739 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -8,7 +8,6 @@ export default ComboBoxComponent.extend({
   classNameBindings: ["categoryStyle", "tagClass"],
   classNames: "tag-drop",
   verticalOffset: 3,
-  collectionHeight: "200",
   value: Ember.computed.alias("tagId"),
   headerComponent: "tag-drop/tag-drop-header",
   rowComponent: "tag-drop/tag-drop-row",
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
index d679b9421ee..8a54a215f1b 100644
--- a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
@@ -6,7 +6,6 @@ export default DropdownSelectBoxComponent.extend({
   classNames: ["toolbar-popup-menu-options"],
   isHidden: Ember.computed.empty("computedContent"),
   showFullTitle: false,
-  collectionHeight: "auto",
 
   @computed("title")
   collectionHeader(title) {
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index eb7e93715fc..e3521cfdc07 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -42,7 +42,6 @@ export default Ember.Mixin.create({
 
   @on("didRender")
   _adjustPosition() {
-    this.$collection().css("max-height", this.get("collectionHeight"));
     this._applyFixedPosition();
     this._applyDirection();
     this._positionWrapper();
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index dca38474368..0190b38d980 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -95,6 +95,7 @@
 
     .select-box-kit-collection, .select-kit-collection {
       padding: 0;
+      max-height: auto;
     }
 
     .dropdown-select-box-header {
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 26e4ba82429..5c47572a5cc 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -197,6 +197,7 @@
     border-radius: inherit;
     -webkit-overflow-scrolling: touch;
     margin: 0;
+    max-height: 200px;
 
     .select-kit-collection {
       padding: 0;
diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6
index 2e39a6dd40b..3cf74cd51ad 100644
--- a/test/javascripts/components/single-select-test.js.es6
+++ b/test/javascripts/components/single-select-test.js.es6
@@ -158,23 +158,6 @@ componentTest('doesn’t render collection content before first expand', {
   }
 });
 
-componentTest('supports options to limit size', {
-  template: '{{single-select collectionHeight=20 content=content}}',
-
-  beforeEach() {
-    this.set("content", ["robin", "régis"]);
-  },
-
-  test(assert) {
-    this.get('subject').expand();
-
-    andThen(() => {
-      const height = find(".select-kit-collection").height();
-      assert.equal(parseInt(height, 10), 20, "it limits the height");
-    });
-  }
-});
-
 componentTest('dynamic headerText', {
   template: '{{single-select value=1 content=content}}',