diff --git a/components/onlinepackagemanager/opkman_visualtree.pas b/components/onlinepackagemanager/opkman_visualtree.pas
index 147c955678..8b42ce5c69 100644
--- a/components/onlinepackagemanager/opkman_visualtree.pas
+++ b/components/onlinepackagemanager/opkman_visualtree.pas
@@ -1677,7 +1677,8 @@ begin
   else if (FHoverColumn = 4) and (FHoverNode <> nil) then
   begin
     Data := VST.GetNodeData(FHoverNode);
-    if (Data^.DataType = 17) or (Data^.DataType = 18) then
+    if ((Data^.DataType = 17) and (Trim(Data^.HomePageURL) <> '')) or
+       ((Data^.DataType = 18) and (Trim(Data^.DownloadURL) <> '')) then
       FVST.Cursor := crHandPoint;
   end;
 end;