diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index c8d2d7e..9a950e7 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -48,9 +48,9 @@ function playBrowsedTracks(addtoqueue, trackid) {
                     if (this.id == trackid) {
                         selected = counter;
                     }
-                    mopidy.tracklist.add(null, null, this.id);
                     counter++;
                 });
+                mopidy.tracklist.add(browseTracks);
                 break;
             default:
                 break;
diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index c24944e..dbd4d69 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -47,6 +47,7 @@ var customPlaylists = [];
 var customTracklists = [];
 
 var browseStack = [];
+var browseTracks = [];
 
 var ua = navigator.userAgent,
     isMobileSafari = /Mac/.test(ua) && /Mobile/.test(ua),
diff --git a/mopidy_musicbox_webclient/static/js/process_ws.js b/mopidy_musicbox_webclient/static/js/process_ws.js
index c8e0d31..1b750ff 100644
--- a/mopidy_musicbox_webclient/static/js/process_ws.js
+++ b/mopidy_musicbox_webclient/static/js/process_ws.js
@@ -106,12 +106,14 @@ function processBrowseDir(resultArr) {
 	child += backHtml;
     }
 
+    browseTracks = [];
     for (var i = 0; i < resultArr.length; i++) {
         iconClass = getMediaClass(resultArr[i].uri);
 	if(resultArr[i].type == 'track' ) {
 //	    console.log(resultArr[i]);
         mopidy.library.lookup(resultArr[i].uri).then(function (resultArr) {
             popupData[resultArr[0].uri] = resultArr[0];
+            browseTracks.push(resultArr[0]);
         }, console.error);
         child += '<li class="song albumli" id="browselisttracks-' + resultArr[i].uri + '">' +
 		'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\', \'' + resultArr[i].uri + '\');">' +