diff --git a/skins/base/views/atoms/create_room/Presets.js b/skins/base/views/atoms/create_room/Presets.js
index 66cbcc323b..db980dad4e 100644
--- a/skins/base/views/atoms/create_room/Presets.js
+++ b/skins/base/views/atoms/create_room/Presets.js
@@ -24,6 +24,10 @@ module.exports = React.createClass({
     displayName: 'CreateRoomPresets',
     mixins: [PresetsController],
 
+    onValueChanged: function(ev) {
+        this.setState({preset: ev.target.value})
+    },
+
     render: function() {
         return (
             <select className="mx_PresetOption" onChange={this.onValueChanged} defaultValue={this.state.preset}>
diff --git a/skins/base/views/atoms/create_room/RoomNameTextbox.js b/skins/base/views/atoms/create_room/RoomNameTextbox.js
index e8a877362a..9d0ddfdf35 100644
--- a/skins/base/views/atoms/create_room/RoomNameTextbox.js
+++ b/skins/base/views/atoms/create_room/RoomNameTextbox.js
@@ -24,6 +24,10 @@ module.exports = React.createClass({
     displayName: 'CreateRoomButton',
     mixins: [RoomNameTextboxController],
 
+    onValueChanged: function(ev) {
+        this.setState({room_name: ev.target.value})
+    },
+
     render: function() {
         return (
             <input type="text" className="mx_RoomNameTextbox" placeholder="ex. MyNewRoom" onChange={this.onValueChanged}/>
diff --git a/src/controllers/atoms/create_room/Presets.js b/src/controllers/atoms/create_room/Presets.js
index 0ae0ffb40a..5ff7327e5a 100644
--- a/src/controllers/atoms/create_room/Presets.js
+++ b/src/controllers/atoms/create_room/Presets.js
@@ -23,10 +23,6 @@ module.exports = {
         default_preset: React.PropTypes.string
     },
 
-    onValueChanged: function(ev) {
-        this.setState({preset: ev.target.value})
-    },
-
     getDefaultProps: function() {
         return {
             default_preset: 'private_chat',
diff --git a/src/controllers/atoms/create_room/RoomNameTextbox.js b/src/controllers/atoms/create_room/RoomNameTextbox.js
index a5017c89cc..e78692d992 100644
--- a/src/controllers/atoms/create_room/RoomNameTextbox.js
+++ b/src/controllers/atoms/create_room/RoomNameTextbox.js
@@ -23,10 +23,6 @@ module.exports = {
         default_name: React.PropTypes.string
     },
 
-    onValueChanged: function(ev) {
-        this.setState({room_name: ev.target.value})
-    },
-
     getDefaultProps: function() {
         return {
             default_name: '',