1 files changed, 26 insertions, 2 deletions

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index aef48230..c3c2a6de 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -116,6 +116,14 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
     handleShowMaterialPopup: {
         enumerable: false,
         value: function (event) {
+            var piButton = this.application.eventManager.componentClaimingPointer("mouse");
+            if(piButton) {
+                this.selectedMaterialNode = piButton.element;
+            } else {
+                this.selectedMaterialNode = null;
+            }
+
+            this.materialId = event.detail.materialId;
             this._showMaterialPopup(event.detail);
         }
     },
@@ -209,11 +217,27 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
 
     willPositionPopup: {
         value: function(popup, defaultPosition) {
-            var content = popup.content.element,
+            var left,
+                top,
+                content = popup.content.element,
                 contentHt = parseFloat(content.style.height) || content.offsetHeight || 0,
                 contentWd = parseFloat(content.style.width) || content.offsetWidth || 0,
                 pt = webkitConvertPointFromNodeToPage(this.selectedMaterialNode, new WebKitPoint(0, 0));
-            return {top: pt.y - contentHt + 10, left: pt.x - contentWd + 10};
+                        
+                        if(!pt) {
+                return defaultPosition;
+            } 
+
+            top = pt.y - contentHt + 10;
+            if(top < 0) {
+                top = 0;
+            }
+            left = pt.x - contentWd + 10;
+            if(left < 0) {
+                left = 0;
+            }
+
+            return {top:top, left:left};
         }
     }
 });