diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js.es6
index 1a17c6bbe22..29d535e8309 100644
--- a/app/assets/javascripts/discourse/components/radio-button.js.es6
+++ b/app/assets/javascripts/discourse/components/radio-button.js.es6
@@ -1,11 +1,16 @@
+import computed from "ember-addons/ember-computed-decorators";
+
 export default Ember.Component.extend({
   tagName : "input",
   type : "radio",
-  attributeBindings : [ "name", "type", "value", "checked:checked" ],
+  attributeBindings : ["name", "type", "value", "checked:checked", "disabled:disabled"],
+
   click : function() {
     this.set("selection", this.$().val());
   },
-  checked : function() {
-    return this.get("value") === this.get("selection");
-  }.property('selection'),
+
+  @computed('value', 'selection')
+  checked(value, selection) {
+    return value === selection;
+  },
 });