diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index 406f207f15..844fe3410f 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -601,6 +601,7 @@
             <action idref="delete_doc" />
             <action idref="take_ownership_doc" />
             <action idref="manage_content_users" />
+            <action idref="run_action" />
          </action-group>
          
          <!-- Actions Menu for Folder Link Details screen -->
@@ -610,6 +611,7 @@
             <action idref="delete_doc" />
             <action idref="take_ownership_space" />
             <action idref="manage_content_users" />
+            <action idref="run_action" />
          </action-group>
          
          <!-- Actions Menu for Manage Rules screen -->
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
index cef45fff85..69048669df 100644
--- a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
@@ -31,6 +31,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.model.FileExistsException;
 import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.model.FileNotFoundException;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.CopyService;
@@ -260,7 +261,7 @@ public class ClipboardBean
                   
                   // we create a special Link Object node that has a property to reference the original
                   // use FileFolderService to check if already exists as using nodeService directly here
-                  String linkTo = Application.getMessage(FacesContext.getCurrentInstance(), MSG_LINK_TO);
+                  String linkTo = Application.getMessage(FacesContext.getCurrentInstance(), MSG_LINK_TO);                
                   
                   // create the node using the nodeService (can only use FileFolderService for content)
                   Map<QName, Serializable> props = new HashMap<QName, Serializable>(4, 1.0f);
@@ -357,8 +358,16 @@ public class ClipboardBean
          }
          catch (FileExistsException fileExistsErr)
          {
-            String copyOf = Application.getMessage(FacesContext.getCurrentInstance(), MSG_COPY_OF);
-            name = copyOf + ' ' + name;
+            if (item.Mode == ClipboardStatus.COPY)
+            {    
+                String copyOf = Application.getMessage(FacesContext.getCurrentInstance(), MSG_COPY_OF);
+                name = copyOf + ' ' + name;
+            }
+            else
+            {
+                // we should not rename an item when it is being moved
+                throw fileExistsErr;
+            }
          }
       }
    }