diff --git a/src/pfwbged/folder/folder.py b/src/pfwbged/folder/folder.py
index fd621b3..03050de 100644
--- a/src/pfwbged/folder/folder.py
+++ b/src/pfwbged/folder/folder.py
@@ -161,6 +161,7 @@ class FolderView(DefaultView, ClassifiedItems):
     pass
 
 
+@grok.subscribe(IFolder, IObjectAddedEvent)
 @grok.subscribe(IDmsDocument, IObjectAddedEvent)
 def move_to_proper_location(context, event):
     folder = context.getParentNode()
@@ -177,3 +178,9 @@ def move_to_proper_location(context, event):
     clipboard = folder.manage_cutObjects([context.id])
     documents_folder = api.portal.get().documents
     result = documents_folder.manage_pasteObjects(clipboard)
+
+    # makes sure original object is deleted
+    try:
+        folder.manage_delObjects([context.id])
+    except AttributeError:
+        pass
diff --git a/src/pfwbged/folder/profiles/default/types/pfwbgedfolder.xml b/src/pfwbged/folder/profiles/default/types/pfwbgedfolder.xml
index 2f61257..353ba67 100644
--- a/src/pfwbged/folder/profiles/default/types/pfwbgedfolder.xml
+++ b/src/pfwbged/folder/profiles/default/types/pfwbgedfolder.xml
@@ -25,6 +25,7 @@
  <!-- Contained Types -->
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types" purge="False">
+  <element value="pfwbgedfolder"/>
   <element value="pfwbgedlink"/>
   <element value="dmsincomingmail"/>
   <element value="dmsoutgoingmail"/>