diff --git a/src/react-components/avatar-selector.js b/src/react-components/avatar-selector.js
index 292a1946fb827907f72d91049ceb83e545e9247f..abbe30763a2b29f24ce8f7b985f41b42afc8e067 100644
--- a/src/react-components/avatar-selector.js
+++ b/src/react-components/avatar-selector.js
@@ -14,15 +14,17 @@ class AvatarSelector extends Component {
     const numAvatars = this.props.avatars.length;
     return ((currAvatarIndex + direction) % numAvatars + numAvatars) % numAvatars;
   }
+  nextAvatarIndex = () => this.getAvatarIndex(1)
+  previousAvatarIndex = () => this.getAvatarIndex(-1)
 
-  nextAvatar = () => {
-    const newAvatarIndex = this.getAvatarIndex(1);
-    this.props.onChange(this.props.avatars[newAvatarIndex].id);
+  emitChangeToNext = () => {
+    const nextAvatarId = this.props.avatars[nextAvatarIndex()].id;
+    this.props.onChange(nextAvatarId);
   }
 
-  prevAvatar = () => {
-    const newAvatarIndex = this.getAvatarIndex(-1);
-    this.props.onChange(this.props.avatars[newAvatarIndex].id);
+  emitChangeToPrevious = () => {
+    const prevAvatarId = this.props.avatars[prevAvatarIndex()].id;
+    this.props.onChange(prevAvatarId);
   }
 
   componentDidUpdate() {
@@ -105,10 +107,10 @@ class AvatarSelector extends Component {
           position="0 0 0"
         ></a-gltf-entity>
       </a-scene>
-      <button className="avatar-selector__prev-button" onClick={this.prevAvatar}>
+      <button className="avatar-selector__prev-button" onClick={this.emitChangeToPrevious}>
         <i className="avatar-selector__button-icon material-icons">keyboard_arrow_left</i>
       </button>
-      <button className="avatar-selector__next-button" onClick={this.nextAvatar}>
+      <button className="avatar-selector__next-button" onClick={this.emitChangeToNext}>
         <i className="avatar-selector__button-icon material-icons">keyboard_arrow_right</i>
       </button>
       </div>