diff --git a/assets/sass/pages/_music.sass b/assets/sass/pages/_music.sass
index e9df469..8b543cf 100755
--- a/assets/sass/pages/_music.sass
+++ b/assets/sass/pages/_music.sass
@@ -62,18 +62,20 @@
 .album-art
   width: 100%
 
-.music-album .thumbnail
-  +transition(background, 200ms)
-
-  &:hover
-    background: #f0f0f0
-    cursor: pointer
-
-    a
-      color: $main-color
-
+.music-album
   &.selected
-    background: #e0e0e0
+    .thumbnail
+      background: #e0e0e0
 
-    a
-      color: $main-color
+      a
+        color: $main-color
+
+  .thumbnail
+    +transition(background, 200ms)
+
+    &:hover
+      background: #f0f0f0
+      cursor: pointer
+
+      a
+        color: $main-color
diff --git a/public/css/main.css b/public/css/main.css
index fe41f58..9b00235 100755
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -680,6 +680,10 @@ body {
 .album-art {
   width: 100%; }
 
+.music-album.selected .thumbnail {
+  background: #e0e0e0; }
+  .music-album.selected .thumbnail a {
+    color: #e51400; }
 .music-album .thumbnail {
   -webkit-transition: background, 200ms;
   -moz-transition: background, 200ms;
@@ -689,10 +693,6 @@ body {
     cursor: pointer; }
     .music-album .thumbnail:hover a {
       color: #e51400; }
-  .music-album .thumbnail.selected {
-    background: #e0e0e0; }
-    .music-album .thumbnail.selected a {
-      color: #e51400; }
 
 .shows-header {
   margin-top: -20px;
diff --git a/public/js/music.js b/public/js/music.js
index c9f71fc..ad70155 100755
--- a/public/js/music.js
+++ b/public/js/music.js
@@ -10,15 +10,15 @@ $(document).ready(function() {
   });
 
   // on album art click
-  $('.music-album').on('click', function() {
+  $('.music-album thumbnail').on('click', function() {
     // change selected album
     changeSelectedAlbum(this);
   });
 });
 
 function changeSelectedAlbum(albumElem) {
-  var oldSelected = $('.music-album.selected');
-  var newSelected = $(albumElem);
+  var oldSelected = $('.music-album.selected').parent();
+  var newSelected = $(albumElem).parent();
 
   if (oldSelected.data('albumid') != newSelected.data('albumid')) {
     // remove selected class from the old element and add it to the new one