diff --git a/dashboard-ui/css/images/media/btn_queue.png b/dashboard-ui/css/images/media/btn_queue.png
new file mode 100644
index 0000000000..ec32a0553a
Binary files /dev/null and b/dashboard-ui/css/images/media/btn_queue.png differ
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 4b8af6ea3d..d4d04b142a 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -14,13 +14,20 @@
                 <div class="itemImageBlock">
                     <div id="itemMedia" style="position: relative;">
                         <div id="itemImage"></div>
-                        <div id="playButtonShadow" style="display: none; height: 48px; position: absolute; bottom: 0; left: 0; right: 0; background: black; opacity: .75;">
-                        </div>
+
+                        <div id="playButtonShadow" style="display: none; height: 48px; position: absolute; bottom: 0; left: 0; right: 0; background: black; opacity: .75;"></div>
                         <button id="btnPlayMenu" type="button" class="imageButton" style="display: none; position: absolute; bottom: 5px; left: 10px;" data-role="none" title="Play">
                             <img src="css/images/media/playCircle.png" style="height: 28px;" />
                         </button>
+
+	                    <div id="queueButtonShadow" style="display: none; height: 48px; position: absolute; bottom: 0; left: 0; right: 0; background: black; opacity: .75;"></div>
+	                    <button id="btnQueueMenu" type="button" class="imageButton" style=" position: absolute; bottom: 5px; left: 50px;" data-role="none" title="Queue">
+		                    <img src="css/images/media/btn_queue.png" style="height: 28px;" />
+	                    </button>
                     </div>
                     <div id="playMenuAnchor"></div>
+	                <div id="queueMenuAnchor"></div>
+
                 </div>
 
                 <div class="itemDetailBlock">
@@ -67,9 +74,15 @@
                     <li data-role="list-divider" data-theme="a">Play Menu</li>
                     <li><a href="#" id="btnPlay">Play</a></li>
                     <li><a href="#" id="btnResume">Resume</a></li>
-	                <li><a href="#" id="btnQueue">Add to Queue</a></li>
                 </ul>
             </div>
+
+	        <div data-role="popup" id="queueMenu" data-corners="false" data-theme="c">
+		        <ul data-role="listview" style="min-width: 150px;" data-theme="c">
+			        <li data-role="list-divider" data-theme="a">Queue Menu</li>
+			        <li><a href="#" id="btnQueue">Add to Queue</a></li>
+		        </ul>
+	        </div>
         </div>
     </div>
 </body>
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index dfc3b1879a..974ad81302 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -38,9 +38,13 @@
             if (MediaPlayer.canPlay(item)) {
                 $('#btnPlayMenu', page).show();
                 $('#playButtonShadow', page).show();
+	            //$('#btnQueueMenu', page).show();
+	            //$('#queueButtonShadow', page).show();
             } else {
                 $('#btnPlayMenu', page).hide();
                 $('#playButtonShadow', page).hide();
+	            $('#btnQueueMenu', page).hide();
+	            $('#queueButtonShadow', page).hide();
             }
 
             Dashboard.hideLoadingMsg();
@@ -474,8 +478,7 @@
 
             var userdata = currentItem.UserData || {};
 
-	        //always pop menu now so we can have a queue link
-            //if (userdata.PlaybackPositionTicks) {
+            if (userdata.PlaybackPositionTicks) {
 
                 var pos = $('#playMenuAnchor', page).offset();
 
@@ -484,12 +487,22 @@
                     y: pos.top + 20
                 });
 
-            //}
-            //else {
-            //    play();
-            //}
+            }
+            else {
+                play();
+            }
         });
 
+	    $('#btnQueueMenu', page).on('click', function () {
+		    var pos = $('#queueMenuAnchor', page).offset();
+
+		    $('#queueMenu', page).popup("open", {
+			    x: pos.left + 165,
+			    y: pos.top + 20
+		    });
+	    });
+
+
         $('#btnPlay', page).on('click', function () {
 
             $('#playMenu', page).popup("close");
@@ -507,7 +520,7 @@
 
 	    $('#btnQueue', page).on('click', function () {
 
-		    $('#playMenu', page).popup("close");
+		    $('#queueMenu', page).popup("close");
 		    Playlist.add(currentItem);
 	    });