diff --git a/client/views/userProfile.html b/client/views/userProfile.html
index 2d1098b..d590ad8 100644
--- a/client/views/userProfile.html
+++ b/client/views/userProfile.html
@@ -16,7 +16,9 @@
     <div class="col-md-9">
       <h2>Friends <span class="badge">{{this.profile.friends.length}}</span></h2>
       {{#each userFriends}}
-        <div class="avatar" style="background-image:url('{{avatarUrl}}')"></div>
+        <a href="{{pathFor 'userProfile'}}">
+          <div class="avatar" style="background-image:url('{{avatarUrl}}')"></div>
+        </a>
       {{/each}}
     </div>
 
diff --git a/client/views/userProfile.js b/client/views/userProfile.js
index 23c27e0..e690ccc 100644
--- a/client/views/userProfile.js
+++ b/client/views/userProfile.js
@@ -23,9 +23,6 @@ Template.userProfile.events = {
   'click [data-action="edit-avatar"]': function() {
     Session.set("showEditAvatarBar",!Session.get("showEditAvatarBar"));
   },
-  'click div.avatar': function() {
-    Router.go('userProfile', {_id: this._id});
-  }
 };
 
 Template.userPlaylist.songCount = function() {