diff --git a/containments/desktop/package/contents/ui/FolderItemDelegate.qml b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
--- a/containments/desktop/package/contents/ui/FolderItemDelegate.qml
+++ b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
@@ -39,6 +39,7 @@
     property Item labelArea: loader.item ? loader.item.labelArea : null
     property Item actionsOverlay: loader.item ? loader.item.actionsOverlay : null
     property Item hoverArea: loader.item ? loader.item.hoverArea : null
+    property Item frame: loader.item ? loader.item.frame : null
     property Item toolTip: loader.item ? loader.item.toolTip : null
 
     function openPopup() {
@@ -79,6 +80,7 @@
             property Item labelArea: frameLoader.textShadow || label
             property Item actionsOverlay: actions
             property Item hoverArea: toolTip
+            property Item frame: frameLoader
             property Item toolTip: toolTip
             property Item selectionButton: null
             property Item popupButton: null
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -324,11 +324,9 @@
             if (!item || item.blank) {
                 gridView.hoveredItem = null;
             } else {
-                var aPos = mapToItem(item.actionsOverlay, mouse.x, mouse.y);
-                var hPos = mapToItem(item.hoverArea, mouse.x, mouse.y);
+                var fPos = mapToItem(item.frame, mouse.x, mouse.y);
 
-                if ((hPos.x < 0 || hPos.y < 0 || hPos.x > item.hoverArea.width || hPos.y > item.hoverArea.height)
-                    && aPos.x < 0) {
+                if (fPos.x < 0 || fPos.y < 0 || fPos.x > item.frame.width || fPos.y > item.frame.height) {
                     gridView.hoveredItem = null;
                 }
             }