diff --git a/source/java/org/alfresco/web/bean/NavigationBean.java b/source/java/org/alfresco/web/bean/NavigationBean.java
index 897aff4c8e..f8ee991f28 100644
--- a/source/java/org/alfresco/web/bean/NavigationBean.java
+++ b/source/java/org/alfresco/web/bean/NavigationBean.java
@@ -129,6 +129,14 @@ public class NavigationBean
    {
       return Application.getCurrentUser(FacesContext.getCurrentInstance());
    }
+   
+   /**
+    * @return true if the system is running within a JSR-168 portal container
+    */
+   public boolean getInPortalServer()
+   {
+      return Application.inPortalServer();
+   }
 
    /**
     * Return the expanded state of the Shelf panel wrapper component
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
index cd82ec0969..d849bd071f 100644
--- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
@@ -200,7 +200,7 @@ public class UIClipboardShelfItem extends UIShelfItem
             out.write(buildActionLink(ACTION_REMOVE_ITEM, i, bundle.getString(MSG_REMOVE_ITEM), WebResources.IMAGE_REMOVE));
             out.write(" ");
             out.write(buildActionLink(ACTION_PASTE_ITEM, i, bundle.getString(MSG_PASTE_ITEM), WebResources.IMAGE_PASTE));
-            if (item.Mode == ClipboardStatus.COPY)
+            if (item.Mode == ClipboardStatus.COPY && dd.isSubClass(item.Node.getType(), ContentModel.TYPE_LINK) == false)
             {
                out.write(" ");
                out.write(buildActionLink(ACTION_PASTE_LINK, i, bundle.getString(MSG_PASTE_LINK), WebResources.IMAGE_PASTE_LINK));
diff --git a/source/web/jsp/dialog/filelink-details.jsp b/source/web/jsp/dialog/filelink-details.jsp
index 8142b719aa..ab3d6fface 100644
--- a/source/web/jsp/dialog/filelink-details.jsp
+++ b/source/web/jsp/dialog/filelink-details.jsp
@@ -134,11 +134,13 @@
                                           <a href='<a:outputText value="#{DocumentDetailsBean.nodeRefUrl}" id="out3" />' onclick="return false;"><a:outputText value="#{msg.noderef_link}" id="out4" /></a>
                                        </td>
                                     </tr>
+                                    <a:panel id="link-panel" rendered="#{NavigationBean.inPortalServer == false}">
                                     <tr>
                                        <td colspan=3>
                                           <a href='<%=request.getContextPath()%><a:outputText value="#{LinkPropertiesBean.fileLinkBookmarkUrl}" id="out5" />'><a:outputText value="#{msg.link_destination_details}" id="out6" /></a>
                                        </td>
                                     </tr>
+                                    </a:panel>
                                  </table>
                               </a:panel>
                               
diff --git a/source/web/jsp/dialog/spacelink-details.jsp b/source/web/jsp/dialog/spacelink-details.jsp
index 6674acee79..c4032a00f1 100644
--- a/source/web/jsp/dialog/spacelink-details.jsp
+++ b/source/web/jsp/dialog/spacelink-details.jsp
@@ -122,11 +122,13 @@
                                           <a href='<a:outputText value="#{SpaceDetailsBean.nodeRefUrl}" id="out3" />' onclick="return false;"><a:outputText value="#{msg.noderef_link}" id="out4" /></a>
                                        </td>
                                     </tr>
+                                    <a:panel id="link-panel" rendered="#{NavigationBean.inPortalServer == false}">
                                     <tr>
                                        <td colspan=4>
                                           <a href='<%=request.getContextPath()%><a:outputText value="#{LinkPropertiesBean.spaceLinkDestinationUrl}" id="out5" />'><a:outputText value="#{msg.link_destination_details}" id="out6" /></a>
                                        </td>
                                     </tr>
+                                    </a:panel>
                                  </table>
                               </a:panel>