diff --git a/app/models/project_folder.rb b/app/models/project_folder.rb
index bf0720f005..06b8fcfead 100644
--- a/app/models/project_folder.rb
+++ b/app/models/project_folder.rb
@@ -27,7 +27,7 @@ def authorized_assets
 
    #assets that are not associated to any assay
   def authorized_hanging_assets
-    assets.select{ |a| a.respond_to?(:assays) && a.assays.empty? && a.can_view? }
+		assets.select { |a| a.class.name != 'Sample' && a.can_view? }
   end
 
   #what is displayed in the tree
@@ -39,8 +39,13 @@ def count
     authorized_hanging_assets.count
   end
 
-  def self.new_items_folder project
-    ProjectFolder.where(:project_id=>project.id,:incoming=>true).first
+  def self.new_items_folder(project, asset=nil)
+		if asset.present?
+			folder_name = I18n.t(asset.class.name.underscore.downcase).pluralize
+			ProjectFolder.where(:project_id=>project.id, :title=>folder_name).first
+		else
+      ProjectFolder.where(:project_id=>project.id,:incoming=>true).first
+		end
   end
 
   #constucts the default project folders for a given project from a yaml file, by default using Rails.root/config/default_data/default_project_folders.yml
diff --git a/lib/seek/acts_as_asset/folders.rb b/lib/seek/acts_as_asset/folders.rb
index d4f746f15b..200d5f78a6 100644
--- a/lib/seek/acts_as_asset/folders.rb
+++ b/lib/seek/acts_as_asset/folders.rb
@@ -5,7 +5,7 @@ module Folders
       module InstanceMethods
         def add_new_to_folder
           projects.each do |project|
-            pf = ProjectFolder.new_items_folder project
+            pf = ProjectFolder.new_items_folder(project, self)
             pf.add_assets self unless pf.nil?
           end
         end