diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index e0d5561..2a1cf26 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -8,6 +8,8 @@ function playBrowsedTracks(addtoqueue, trackid) {
         mopidy.playback.stop(true);
         mopidy.tracklist.clear();
     }
+    $('#popupBrowse').popup('close');
+    $('#controlspopup').popup('close');
     toast('Loading...');
 
     trackid = typeof trackid !== 'undefined' ? trackid : $('#popupBrowse').data("track");
diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index 820ce39..a6ce723 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -289,7 +289,7 @@ function resultsToTables(results, target, uri) {
                         html += '<li class="smalldivider"> &nbsp;</li>';
                     }
                     iconClass = getMediaClass(newalbum[0].uri);
-                    var liID = targetmin + '-' + newalbum[j].uri;
+                    var liID = targetmin + '-' + newalbum[0].uri;
                     if (target == CURRENT_PLAYLIST_TABLE) {
                         html += '<li class="song albumli" id="' + liID + '" tlid="' + newtlids[0] + '">' +
                                 '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[0].uri + '\',\'' + newtlids[0] + '\');">' +