diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
index c7929241b80..7de08949191 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -1,6 +1,6 @@
 <form>
   <div class="control-group">
-    {{combo-box content=timerTypes value=selection width="50%"}}
+    {{combo-box allowInitialValueMutation=true content=timerTypes value=selection}}
   </div>
 
   <div>
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6
index 0cca45bafbd..6dfb2a9e9fa 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -13,21 +13,6 @@ export default SelectKitComponent.extend({
   value: null,
   allowInitialValueMutation: true,
 
-  init() {
-    this._super();
-
-    if (this.get("allowInitialValueMutation") === true) {
-      const none = isNone(this.get("none"));
-      const emptyValue = isEmpty(this.get("value"));
-      if (none && emptyValue) {
-        if (!isEmpty(this.get("content"))) {
-          const value = this.valueForContentItem(this.get("content.firstObject"));
-          Ember.run.next(() => this.mutateValue(value));
-        }
-      }
-    }
-  },
-
   @on("didReceiveAttrs")
   _compute() {
     Ember.run.scheduleOnce("afterRender", () => {
@@ -43,6 +28,8 @@ export default SelectKitComponent.extend({
       this.didComputeValue(value);
       this.set("headerComputedContent", this.computeHeaderContent());
       this.didComputeAttributes();
+
+      if (this.get("allowInitialValueMutation")) this.mutateAttributes();
     });
   },
 
@@ -71,7 +58,7 @@ export default SelectKitComponent.extend({
   willComputeValue(value) { return value; },
   computeValue(value) { return value; },
   _beforeDidComputeValue(value) {
-    if (!isEmpty(this.get("content")) && isNone(value) && isNone(this.get("none"))) {
+    if (!isEmpty(this.get("content")) && isEmpty(value) && isNone(this.get("none"))) {
       value = this.valueForContentItem(get(this.get("content"), "firstObject"));
     }