diff --git a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl
index 95be8acd6..e582ac5d2 100755
--- a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl
+++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl
@@ -33,7 +33,7 @@
                <table style="width: 500px;">
                    <!-- clip information -->
                    <tr><td style="border:0" colspan="5"></tr>
-                   <tr class="blue1">
+                   <tr class="blue1" style="cursor: move;">
                       <td>{$i.title}</td>
                       <td style="width: 50px;">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</td>
                       <td style="width: 150px">{$i.creator}</td>
@@ -93,4 +93,4 @@ addDragList( draglist_manager );
 </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
index 0466997b7..56b2d04e8 100755
--- a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
@@ -137,16 +137,20 @@
         if (ie5) {
            var clickX  = event.clientX;
            var clickY  = event.clientY + document.body.scrollTop;
+           var winX    = document.body.clientWidth;
            var winY    = document.body.clientHeight;
+           var scrollX = document.body.scrollLeft;
            var scrollY = document.body.scrollTop;
         } else {
            var clickX  = e.pageX;
            var clickY  = e.pageY;
+           var winX    = window.innerWidth;
            var winY    = window.innerHeight;
+           var scrollX = window.scrollX;
            var scrollY = window.scrollY;
         }
 
-        if (clickX < contextmenuWidth)                      var xPos = clickX;
+        if (clickX + contextmenuWidth < winX)               var xPos = clickX;
         else                                                var xPos = clickX - contextmenuWidth;
 
         if (clickY + contextmenuHeight > winY + scrollY)    var yPos = clickY - contextmenuHeight;